From 243b0c5b3b583ed1ec163eb78f123260b67be621 Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 2 Nov 2010 21:49:34 +0100 Subject: [PATCH] Changed: #878 Fix typos in comments/code --- code/CMakeLists.txt | 4 ++-- .../src/entities_game_service/player_manager/character.cpp | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index a504198ed..c7cac3e19 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -25,7 +25,7 @@ SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules;${CMAKE_MODULE_P # Set CMake 2.6 Policies. IF(COMMAND cmake_policy) # 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) # Works around warnings about escaped quotes in ADD_DEFINITIONS @@ -98,7 +98,7 @@ IF(WIN32) SET(WINSOCK2_LIB ws2_32.lib) FIND_PACKAGE(External REQUIRED) - + IF(${CMAKE_MAKE_PROGRAM} MATCHES "Common7") # convert IDE fullpath to VC++ path STRING(REGEX REPLACE "Common7/IDE/.+" "VC" VC_DIR ${CMAKE_MAKE_PROGRAM}) diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character.cpp b/code/ryzom/server/src/entities_game_service/player_manager/character.cpp index d1bda77e9..8cec0423e 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/character.cpp +++ b/code/ryzom/server/src/entities_game_service/player_manager/character.cpp @@ -5704,7 +5704,6 @@ bool CCharacter::onAnimalHungry( uint petIndex, bool justBecameHungry ) // Consume to full satiety (last useful unit is entirely consumed) animal.Satiety = animal.MaxSatiety; nbUnits = (sint)ceil(caloriesNeeded / caloriesPerUnit); - } nbItemsLeftToConsume -= nbUnits;