[Wesnoth-cvs-commits] wesnoth/src game.cpp

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    04/11/21 22:05:31

Modified files:
        src            : game.cpp 

Log message:
        Removal of MSVC warnings by uglifying the code is just plain evil. 
There is no way I would allow GCC users to suffer from MSVC shortcomings.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.164&tr2=1.165&r1=text&r2=text

Patches:
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.164 wesnoth/src/game.cpp:1.165
--- wesnoth/src/game.cpp:1.164  Sun Nov 21 22:00:06 2004
+++ wesnoth/src/game.cpp        Sun Nov 21 22:05:30 2004
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.164 2004/11/21 22:00:06 silene Exp $ */
+/* $Id: game.cpp,v 1.165 2004/11/21 22:05:30 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -140,8 +140,7 @@
                                                        config snapshot;
 
                                                        
recorder.save_game(label, snapshot, state.starting_pos);
-                                               } 
catch(gamestatus::save_game_failed& e) {
-                                                       e;
+                                               } 
catch(gamestatus::save_game_failed&) {
                                                        
gui::show_dialog(disp,NULL,"",_("The game could not be saved"),gui::MESSAGE);
                                                        retry = true;
                                                };
@@ -202,8 +201,7 @@
                                if(should_save == 0) {
                                        try {
                                                save_game(state);
-                                       } catch(gamestatus::save_game_failed& 
e) {
-                                               e;
+                                       } catch(gamestatus::save_game_failed&) {
                                                
gui::show_dialog(disp,NULL,"",_("The game could not be saved"),gui::MESSAGE);
                                                retry = true;
                                        }
@@ -295,8 +293,7 @@
                                        
data_tree_checksum().write(checksum_cfg);
                                        std::cerr << "wrote checksum: '" << 
checksum_cfg.write() << "'\n";
                                        
write_file(fname_checksum,checksum_cfg.write());
-                               } catch(io_exception& e) {
-                                       e;
+                               } catch(io_exception&) {
                                        std::cerr << "could not write to cache 
'" << fname << "'\n";
                                }
 
@@ -833,8 +830,7 @@
                    _("The file you have tried to load is corrupt") + 
std::string(": '") + e.message + "'",
                    gui::OK_ONLY);
                return false;
-       } catch(io_exception& e) {
-               e;
+       } catch(io_exception&) {
                gui::show_dialog(disp(),NULL,"",_("File I/O Error while reading 
the game"),gui::OK_ONLY);
                return false;
        }
@@ -1131,14 +1127,11 @@
                use_caching_ = old_cache;
 
                gui::show_dialog(disp(),NULL,_("Campaign Installed"),_("The 
campaign has been installed."),gui::OK_ONLY);
-       } catch(config::error& e) {
-               e;
+       } catch(config::error&) {
                gui::show_dialog(disp(),NULL,_("Error"),_("Network 
communication error."),gui::OK_ONLY);
-       } catch(network::error& e) {
-               e;
+       } catch(network::error&) {
                gui::show_dialog(disp(),NULL,_("Error"),_("Remote host 
disconnected."),gui::OK_ONLY);
-       } catch(io_exception& e) {
-               e;
+       } catch(io_exception&) {
                gui::show_dialog(disp(),NULL,_("Error"),_("There was a problem 
creating the files necessary to install this campaign."),gui::OK_ONLY);
        }
 }