From 9080ade759bb1f81fb55a07f9f5aabc5d792698a Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Thu, 14 Nov 2013 23:24:17 +0000 Subject: [PATCH] small cleanup from cppcheck --- source/glest_game/world/world.cpp | 13 ------------- source/glest_game/world/world.h | 1 - 2 files changed, 14 deletions(-) diff --git a/source/glest_game/world/world.cpp b/source/glest_game/world/world.cpp index c5461827..d46066b4 100644 --- a/source/glest_game/world/world.cpp +++ b/source/glest_game/world/world.cpp @@ -953,19 +953,6 @@ bool World::canTickWorld() const { return needToTick; } -bool World::canTickFaction(int factionIdx) { - int factionUpdateInterval = (GameConstants::updateFps / GameConstants::maxPlayers); - int expectedFactionIdx = (frameCount / factionUpdateInterval) -1; - if(expectedFactionIdx >= GameConstants::maxPlayers) { - expectedFactionIdx = expectedFactionIdx % GameConstants::maxPlayers; - } - bool result = (expectedFactionIdx == factionIdx); - - if(SystemFlags::getSystemSettingType(SystemFlags::debugUnitCommands).enabled) SystemFlags::OutputDebug(SystemFlags::debugUnitCommands,"In [%s::%s Line: %d] factionIdx = %d, frameCount = %d, GameConstants::updateFps = %d, expectedFactionIdx = %d, factionUpdateInterval = %d, result = %d\n",__FILE__,__FUNCTION__,__LINE__,factionIdx,frameCount,GameConstants::updateFps,expectedFactionIdx,factionUpdateInterval,result); - - return result; -} - void World::tick() { bool showPerfStats = Config::getInstance().getBool("ShowPerfStats","false"); Chrono chronoPerf; diff --git a/source/glest_game/world/world.h b/source/glest_game/world/world.h index 91f0f6e6..260a62c7 100644 --- a/source/glest_game/world/world.h +++ b/source/glest_game/world/world.h @@ -324,7 +324,6 @@ private: //misc void tick(); - bool canTickFaction(int factionIdx); void computeFow(); void updateAllTilesetObjects();