From 5879e87297672fc73e995c76570a46d5918c767e Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Thu, 20 May 2010 20:19:34 +0000 Subject: [PATCH] - added game start debug output to console to show basic faction info --- mk/windoze/Glest.suo | Bin 264704 -> 264192 bytes source/glest_game/game/game.cpp | 2 + source/glest_game/type_instances/faction.h | 1 + source/glest_game/world/world.cpp | 75 +++++++++++++-------- source/glest_game/world/world.h | 2 +- 5 files changed, 52 insertions(+), 28 deletions(-) diff --git a/mk/windoze/Glest.suo b/mk/windoze/Glest.suo index ea2996b675d700c092bec9a39fd5d91255f09034..8e974cbdd87f380008b23fdd3fdb9e3ad73df702 100755 GIT binary patch delta 17944 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 erwr%}waitUntilReady(&checksum); + std::string worldLog = world.DumpWorldToLog(true); + SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] Starting music stream\n",__FILE__,__FUNCTION__); logger.add("Starting music stream", true); StrSound *gameMusic= world.getThisFaction()->getType()->getMusic(); diff --git a/source/glest_game/type_instances/faction.h b/source/glest_game/type_instances/faction.h index e35292bbe..bbcf17b93 100644 --- a/source/glest_game/type_instances/faction.h +++ b/source/glest_game/type_instances/faction.h @@ -98,6 +98,7 @@ public: const UpgradeManager *getUpgradeManager() const {return &upgradeManager;} const Texture2D *getTexture() const {return texture;} int getStartLocationIndex() const {return startLocationIndex;} + bool getThisFaction() const {return thisFaction;} //upgrades void startUpgrade(const UpgradeType *ut); diff --git a/source/glest_game/world/world.cpp b/source/glest_game/world/world.cpp index 74dcc3449..f0423c53f 100644 --- a/source/glest_game/world/world.cpp +++ b/source/glest_game/world/world.cpp @@ -22,6 +22,7 @@ #include "sound_renderer.h" #include "game_settings.h" #include "cache_manager.h" +#include #include "leak_dumper.h" using namespace Shared::Graphics; @@ -800,40 +801,60 @@ void World::computeFow(){ } } -std::string World::DumpWorldToLog() const { +std::string World::DumpWorldToLog(bool consoleBasicInfoOnly) const { + string debugWorldLogFile = Config::getInstance().getString("DebugWorldLogFile","debugWorld.log"); - if(getGameReadWritePath() != "") { - debugWorldLogFile = getGameReadWritePath() + debugWorldLogFile; - } - - std::ofstream logFile; - logFile.open(debugWorldLogFile.c_str(), ios_base::out | ios_base::trunc); - - logFile << "World debug information:" << std::endl; - logFile << "========================" << std::endl; - - //factions (and their related info) - for(int i = 0; i < getFactionCount(); ++i) { - logFile << "Faction detail for index: " << i << std::endl; - logFile << "--------------------------" << std::endl; - logFile << getFaction(i)->toString() << std::endl; + if(getGameReadWritePath() != "") { + debugWorldLogFile = getGameReadWritePath() + debugWorldLogFile; } - //undertake the dead - logFile << "Undertake stats:" << std::endl; - for(int i = 0; i < getFactionCount(); ++i){ - logFile << "Faction: " << getFaction(i)->getType()->getName() << std::endl; - int unitCount = getFaction(i)->getUnitCount(); - for(int j= unitCount - 1; j >= 0; j--){ - Unit *unit= getFaction(i)->getUnit(j); - if(unit->getToBeUndertaken()) { - logFile << "Undertake unit index = " << j << unit->getFullName() << std::endl; - } + if(consoleBasicInfoOnly == true) { + std::cout << "World debug information:" << std::endl; + std::cout << "========================" << std::endl; + + //factions (and their related info) + for(int i = 0; i < getFactionCount(); ++i) { + std::cout << "Faction detail for index: " << i << std::endl; + std::cout << "--------------------------" << std::endl; + + std::cout << "FactionName = " << getFaction(i)->getType()->getName() << std::endl; + std::cout << "FactionIndex = " << intToStr(getFaction(i)->getIndex()) << std::endl; + std::cout << "teamIndex = " << intToStr(getFaction(i)->getTeam()) << std::endl; + std::cout << "startLocationIndex = " << intToStr(getFaction(i)->getStartLocationIndex()) << std::endl; + std::cout << "thisFaction = " << intToStr(getFaction(i)->getThisFaction()) << std::endl; + std::cout << "control = " << intToStr(getFaction(i)->getControlType()) << std::endl; } } + else { - logFile.close(); + std::ofstream logFile; + logFile.open(debugWorldLogFile.c_str(), ios_base::out | ios_base::trunc); + logFile << "World debug information:" << std::endl; + logFile << "========================" << std::endl; + + //factions (and their related info) + for(int i = 0; i < getFactionCount(); ++i) { + logFile << "Faction detail for index: " << i << std::endl; + logFile << "--------------------------" << std::endl; + logFile << getFaction(i)->toString() << std::endl; + } + + //undertake the dead + logFile << "Undertake stats:" << std::endl; + for(int i = 0; i < getFactionCount(); ++i){ + logFile << "Faction: " << getFaction(i)->getType()->getName() << std::endl; + int unitCount = getFaction(i)->getUnitCount(); + for(int j= unitCount - 1; j >= 0; j--){ + Unit *unit= getFaction(i)->getUnit(j); + if(unit->getToBeUndertaken()) { + logFile << "Undertake unit index = " << j << unit->getFullName() << std::endl; + } + } + } + + logFile.close(); + } return debugWorldLogFile; } diff --git a/source/glest_game/world/world.h b/source/glest_game/world/world.h index fef0a3535..d0e1cc536 100644 --- a/source/glest_game/world/world.h +++ b/source/glest_game/world/world.h @@ -153,7 +153,7 @@ public: Game * getGame() { return game; } void setFogOfWar(bool value); - std::string DumpWorldToLog() const; + std::string DumpWorldToLog(bool consoleBasicInfoOnly = false) const; private: