0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify parent-setting code.

Browse source
This commit is contained in:
Eric S. Raymond 2009-05-20 09:36:19 +00:00
parent 0a53d44e5c
commit e9e1a13506
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/savegame.cpp
View file

@ -611,7 +611,7 @@ bool savegame::save_game(CVideo* video, const std::string& filename)
if (filename_ == "")
filename_ = filename;
bool overwriting = (gamestate_.parent == filename_);
bool overwriting = (filename_ == parent);
before_save();
@ -624,21 +624,17 @@ bool savegame::save_game(CVideo* video, const std::string& filename)
LOG_SAVE << "While saving '" << filename_ << "', parent is '" << gamestate_.parent << "' and grandparent is '" << grandparent << "'\n";
if (overwriting) {
parent = gamestate_.parent;
gamestate_.parent = grandparent;
LOG_SAVE << "Temporarily setting parent to '" << grandparent << "'\n";
} else {
gamestate_.parent = parent;
}
LOG_SAVE << "Setting file parent to " << gamestate_.parent << "\n";
write_game_to_disk(filename_);
if (overwriting) {
gamestate_.parent = parent;
LOG_SAVE << "Reverting parent to " << gamestate_.parent << "\n";
} else {
grandparent = gamestate_.parent;
gamestate_.parent = filename_;
LOG_SAVE << "Setting parent to '" << gamestate_.parent << "' and grandpaerent to '" << grandparent << "'\n";
}
grandparent = parent;
parent = filename_;
LOG_SAVE << "Setting parent to '" << parent << "' and grandparent to '" << grandparent << "'\n";
end = SDL_GetTicks();
LOG_SAVE << "Milliseconds to save " << filename_ << ": " << end - start << "\n";