[Wesnoth-commits] r35769 - /trunk/src/savegame.cpp

[esr]

Author: esr
Date: Wed May 20 11:36:19 2009
New Revision: 35769

URL: http://svn.gna.org/viewcvs/wesnoth?rev=35769&view=rev
Log:
Simplify parent-setting code.

Modified:
    trunk/src/savegame.cpp

Modified: trunk/src/savegame.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/savegame.cpp?rev=35769&r1=35768&r2=35769&view=diff
==============================================================================
--- trunk/src/savegame.cpp (original)
+++ trunk/src/savegame.cpp Wed May 20 11:36:19 2009
@@ -611,7 +611,7 @@
                if (filename_ == "")
                        filename_ = filename;
 
-               bool overwriting = (gamestate_.parent == filename_);
+               bool overwriting = (filename_ == parent);
 
                before_save();
 
@@ -624,21 +624,17 @@
                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";


_______________________________________________
Wesnoth-commits mailing list
Wesnoth-commits@gna.org
https://mail.gna.org/listinfo/wesnoth-commits