Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #878 Fix typos in comments/code

Browse source
This commit is contained in:
kervala 2010-11-02 21:49:34 +01:00
parent 34827ed8c7
commit a1a6c669f2
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/CMakeLists.txt
View file

@ -25,7 +25,7 @@ SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules;${CMAKE_MODULE_P
# Set CMake 2.6 Policies. # Set CMake 2.6 Policies.
IF(COMMAND cmake_policy) IF(COMMAND cmake_policy)
# Works around warnings libraries linked against that don't # Works around warnings libraries linked against that don't
# have absolute paths (e.g. -lpthreads) # have absolute paths (e.g. -lpthread)
cmake_policy(SET CMP0003 NEW) cmake_policy(SET CMP0003 NEW)
# Works around warnings about escaped quotes in ADD_DEFINITIONS # Works around warnings about escaped quotes in ADD_DEFINITIONS
@ -98,7 +98,7 @@ IF(WIN32)
SET(WINSOCK2_LIB ws2_32.lib) SET(WINSOCK2_LIB ws2_32.lib)
FIND_PACKAGE(External REQUIRED) FIND_PACKAGE(External REQUIRED)
IF(${CMAKE_MAKE_PROGRAM} MATCHES "Common7") IF(${CMAKE_MAKE_PROGRAM} MATCHES "Common7")
# convert IDE fullpath to VC++ path # convert IDE fullpath to VC++ path
STRING(REGEX REPLACE "Common7/IDE/.+" "VC" VC_DIR ${CMAKE_MAKE_PROGRAM}) STRING(REGEX REPLACE "Common7/IDE/.+" "VC" VC_DIR ${CMAKE_MAKE_PROGRAM})

1
code/ryzom/server/src/entities_game_service/player_manager/character.cpp
View file

@ -5704,7 +5704,6 @@ bool CCharacter::onAnimalHungry( uint petIndex, bool justBecameHungry )
// Consume to full satiety (last useful unit is entirely consumed) // Consume to full satiety (last useful unit is entirely consumed)
animal.Satiety = animal.MaxSatiety; animal.Satiety = animal.MaxSatiety;
nbUnits = (sint)ceil(caloriesNeeded / caloriesPerUnit); nbUnits = (sint)ceil(caloriesNeeded / caloriesPerUnit);
} }
nbItemsLeftToConsume -= nbUnits; nbItemsLeftToConsume -= nbUnits;