mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-02-25 12:12:25 +01:00
Code Issues Projects Releases Wiki Activity

- yes you can load saved games now :)

Browse Source
This commit is contained in:
Mark Vejvoda 2012-03-16 01:58:39 +00:00
parent bbef21da6b
commit 5f15bf20a9
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/glest_game/menu/menu_state_load_game.cpp
View File

@ -18,6 +18,7 @@
#include "menu_state_root.h" #include "menu_state_root.h"
#include "metrics.h" #include "metrics.h"
#include "network_message.h" #include "network_message.h"
#include "game.h"
#include "auto_test.h" #include "auto_test.h"
#include "leak_dumper.h" #include "leak_dumper.h"
@ -45,13 +46,20 @@ MenuStateLoadGame::MenuStateLoadGame(Program *program, MainMenu *mainMenu):
selectedButton=NULL; selectedButton=NULL;
string userData = Config::getInstance().getString("UserData_Root",""); // string userData = Config::getInstance().getString("UserData_Root","");
if(userData != "") { // if(userData != "") {
endPathWithSlash(userData); // endPathWithSlash(userData);
} // }
saveGameDir = userData +"saved"; // saveGameDir = userData +"saved";
endPathWithSlash(saveGameDir); // endPathWithSlash(saveGameDir);
string userData = Config::getInstance().getString("UserData_Root","");
if(getGameReadWritePath(GameConstants::path_logs_CacheLookupKey) != "") {
userData = getGameReadWritePath(GameConstants::path_logs_CacheLookupKey);
}
if(userData != "") {
endPathWithSlash(userData);
}
saveGameDir = userData +"saved/";
lines[0].init(0,slotLinesYBase+slotsLineHeight); lines[0].init(0,slotLinesYBase+slotsLineHeight);
lines[1].init(0, slotLinesYBase-(slotsToRender-1)*slotsLineHeight-5); lines[1].init(0, slotLinesYBase-(slotsToRender-1)*slotsLineHeight-5);
@ -132,6 +140,7 @@ void MenuStateLoadGame::listFiles(int keyButtonsXBase, int keyButtonsYBase, int
paths.push_back(saveGameDir); paths.push_back(saveGameDir);
filenames.clear(); filenames.clear();
findAll(paths, "*.xml", filenames, true, false, true); findAll(paths, "*.xml", filenames, true, false, true);
//printf("filenames = %d\n",filenames.size());
for(int i = 0; i < filenames.size(); ++i) { for(int i = 0; i < filenames.size(); ++i) {
GraphicButton *button=new GraphicButton(); GraphicButton *button=new GraphicButton();
button->init( keyButtonsXBase, keyButtonsYBase, keyButtonsWidth,keyButtonsHeight); button->init( keyButtonsXBase, keyButtonsYBase, keyButtonsWidth,keyButtonsHeight);
@ -189,6 +198,9 @@ void MenuStateLoadGame::mouseClick(int x, int y, MouseButton mouseButton){
{ {
string filename=saveGameDir+selectedButton->getText()+".xml"; string filename=saveGameDir+selectedButton->getText()+".xml";
console.addStdMessage("Trying to load file: '"+filename+"'"); console.addStdMessage("Trying to load file: '"+filename+"'");
Game::loadGame(filename,program,false);
return;
} }
//mainMenu->setState(new MenuStateRoot(program, mainMenu)); //mainMenu->setState(new MenuStateRoot(program, mainMenu));
} }

2
source/shared_lib/sources/xml/xml_parser.cpp
View File

@ -316,7 +316,7 @@ XmlNode *XmlIoRapid::load(const string &path, std::map<string,string> mapTagRepl
} }
//if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d] took msecs: %ld for file [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,chrono.getMillis(),path.c_str()); //if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d] took msecs: %ld for file [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,chrono.getMillis(),path.c_str());
printf("In [%s::%s Line: %d] took msecs: %ld for file [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,chrono.getMillis(),path.c_str()); //printf("In [%s::%s Line: %d] took msecs: %ld for file [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,chrono.getMillis(),path.c_str());
return rootNode; return rootNode;
} }