diff --git a/source/glest_game/game/game.cpp b/source/glest_game/game/game.cpp index 899f211f1..5792531e7 100644 --- a/source/glest_game/game/game.cpp +++ b/source/glest_game/game/game.cpp @@ -4214,7 +4214,7 @@ string Game::getDebugStats(std::map &factionDebugInfo) { str+= "FowAlphaCellsLookupItemCache: " + world.getFowAlphaCellsLookupItemCacheStats()+"\n"; const bool selectBufPickingSelection = Config::getInstance().getBool("EnableSelectBufPicking","false"); - const bool colorPickingSelection = Config::getInstance().getBool("EnableColorPicking","true"); + //const bool colorPickingSelection = Config::getInstance().getBool("EnableColorPicking","true"); const bool frustumPickingSelection = Config::getInstance().getBool("EnableFrustumPicking","false"); if(selectBufPickingSelection) { str += "Unit selection type: selectBuf\n"; @@ -4540,7 +4540,7 @@ void Game::checkWinner() { } void Game::setEndGameTeamWinnersAndLosers() { - bool lose= false; + //bool lose= false; bool checkTeamIndex = !(this->masterserverMode == false && world.getThisFaction()->getPersonalityType() != fpt_Observer); // lookup int is team #, value is players alive on team @@ -4561,7 +4561,7 @@ void Game::setEndGameTeamWinnersAndLosers() { world.getStats()->setVictorious(i); } else if(i == world.getThisFactionIndex()) { - lose= true; + //lose= true; } } } diff --git a/source/glest_game/graphics/renderer.cpp b/source/glest_game/graphics/renderer.cpp index a1b6827d6..86a3edc0e 100644 --- a/source/glest_game/graphics/renderer.cpp +++ b/source/glest_game/graphics/renderer.cpp @@ -6016,11 +6016,10 @@ void Renderer::renderHighlightedCellsOnMinimap() { int lighting=(mc->getAliveCount()%15); Vec3f myColor=Vec3f(color.x/2+.5f/lighting,color.y/2+.5f/lighting,color.z/2+.5f/lighting); - //float alpha = 0.49f+0.5f/(mc->getAliveCount()%15); - float alpha=1.0f; - Vec2i pos=mc->getTargetPos(); - if(texture!=NULL){ + if(texture != NULL) { + //float alpha = 0.49f+0.5f/(mc->getAliveCount()%15); + float alpha=1.0f; renderTextureQuad((int)(pos.x*zoom.x)+pointersize, my + mh-(int)(pos.y*zoom.y), pointersize, pointersize, texture, alpha,&myColor); } } @@ -6692,7 +6691,7 @@ Vec3f Renderer::computeScreenPosition(const Vec3f &worldPos) { void Renderer::computeSelected( Selection::UnitContainer &units, const Object *&obj, const bool withObjectSelection, const Vec2i &posDown, const Vec2i &posUp) { - const bool selectBufPickingSelection = Config::getInstance().getBool("EnableSelectBufPicking","false"); + //const bool selectBufPickingSelection = Config::getInstance().getBool("EnableSelectBufPicking","false"); const bool colorPickingSelection = Config::getInstance().getBool("EnableColorPicking","true"); const bool frustumPickingSelection = Config::getInstance().getBool("EnableFrustumPicking","false"); diff --git a/source/glest_game/main/program.cpp b/source/glest_game/main/program.cpp index 0ac9e9120..b85d7d53d 100644 --- a/source/glest_game/main/program.cpp +++ b/source/glest_game/main/program.cpp @@ -832,7 +832,7 @@ void Program::setDisplaySettings(){ if(!config.getBool("Windowed")) { - int freq= config.getInt("RefreshFrequency"); + //int freq= config.getInt("RefreshFrequency"); int colorBits= config.getInt("ColorBits"); int screenWidth= config.getInt("ScreenWidth"); int screenHeight= config.getInt("ScreenHeight"); diff --git a/source/glest_game/network/network_message.cpp b/source/glest_game/network/network_message.cpp index e2d40f0ce..ed2ecf8e2 100644 --- a/source/glest_game/network/network_message.cpp +++ b/source/glest_game/network/network_message.cpp @@ -91,7 +91,7 @@ void NetworkMessage::dump_packet(string label, const void* data, int dataSize) { const char *buf = static_cast(data); for(unsigned int i = 0; i < dataSize; ++i) { - printf("%d[%X][%d] ",i,buf[i],buf[i]); + printf("%u[%X][%d] ",i,buf[i],buf[i]); if(i % 10 == 0) { printf("\n"); } diff --git a/source/glest_game/types/faction_type.h b/source/glest_game/types/faction_type.h index 5bf4a395c..bba54c884 100644 --- a/source/glest_game/types/faction_type.h +++ b/source/glest_game/types/faction_type.h @@ -101,7 +101,7 @@ public: FactionType(); void load(const string &factionName, const TechTree *techTree, Checksum* checksum, Checksum *techtreeChecksum, std::map > > &loadedFileList); - ~FactionType(); + virtual ~FactionType(); const std::vector getAIBehaviorUnits(AIBehaviorUnitCategory category) const; const std::vector getAIBehaviorUpgrades() const { return vctAIBehaviorUpgrades; }; diff --git a/source/glest_game/world/world.cpp b/source/glest_game/world/world.cpp index 234a69347..7dcfa049f 100644 --- a/source/glest_game/world/world.cpp +++ b/source/glest_game/world/world.cpp @@ -2291,7 +2291,7 @@ void World::computeFow(int factionIdxToTick) { for(int j=0; jgetUnitCount(); ++j){ const Unit *unit= faction->getUnit(j); if(unit->isOperative()){ - int sightRange= unit->getType()->getSight(); + //int sightRange= unit->getType()->getSight(); if(enableFowAlphaCellsLookupItemCache == true) { const FowAlphaCellsLookupItem &cellList = unit->getCachedFow(); diff --git a/source/shared_lib/include/platform/sdl/thread.h b/source/shared_lib/include/platform/sdl/thread.h index 41d7bd295..274113201 100644 --- a/source/shared_lib/include/platform/sdl/thread.h +++ b/source/shared_lib/include/platform/sdl/thread.h @@ -340,6 +340,7 @@ class SlaveThreadControllerInterface { public: virtual void setMasterController(MasterSlaveThreadController *master) = 0; virtual void signalSlave(void *userdata) = 0; + virtual ~SlaveThreadControllerInterface() {} }; class MasterSlaveThreadController {