wesnoth-cvs-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Wesnoth-cvs-commits] wesnoth/src about.cpp actions.cpp ai.cpp ai2.hp...


From: Yann Dirson
Subject: [Wesnoth-cvs-commits] wesnoth/src about.cpp actions.cpp ai.cpp ai2.hp...
Date: Thu, 18 Nov 2004 17:06:28 -0500

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    04/11/18 22:00:13

Modified files:
        src            : about.cpp actions.cpp ai.cpp ai2.hpp 
                         ai_attack.cpp ai_move.cpp builder.cpp 
                         config.cpp dialogs.cpp display.cpp 
                         filesystem.cpp font.cpp game.cpp 
                         game_config.cpp game_events.cpp gamestatus.cpp 
                         help.cpp hotkeys.cpp intro.cpp key.cpp 
                         language.cpp log.cpp map.cpp mouse.cpp 
                         multiplayer.cpp multiplayer_connect.cpp 
                         pathfind.cpp playlevel.cpp playturn.cpp 
                         preferences.cpp replay.cpp sdl_utils.cpp 
                         show_dialog.cpp sound.cpp team.cpp terrain.cpp 
                         unit.cpp unit_types.cpp video.cpp 

Log message:
        dos2unix

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/about.cpp.diff?tr1=1.85&tr2=1.86&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/actions.cpp.diff?tr1=1.164&tr2=1.165&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/ai.cpp.diff?tr1=1.123&tr2=1.124&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/ai2.hpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/ai_attack.cpp.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/ai_move.cpp.diff?tr1=1.51&tr2=1.52&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/builder.cpp.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/config.cpp.diff?tr1=1.112&tr2=1.113&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/dialogs.cpp.diff?tr1=1.70&tr2=1.71&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/display.cpp.diff?tr1=1.275&tr2=1.276&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/filesystem.cpp.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/font.cpp.diff?tr1=1.91&tr2=1.92&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.162&tr2=1.163&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game_config.cpp.diff?tr1=1.91&tr2=1.92&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game_events.cpp.diff?tr1=1.112&tr2=1.113&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/gamestatus.cpp.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/help.cpp.diff?tr1=1.54&tr2=1.55&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/hotkeys.cpp.diff?tr1=1.64&tr2=1.65&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/intro.cpp.diff?tr1=1.63&tr2=1.64&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/key.cpp.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/language.cpp.diff?tr1=1.57&tr2=1.58&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/log.cpp.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/map.cpp.diff?tr1=1.42&tr2=1.43&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/mouse.cpp.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer.cpp.diff?tr1=1.128&tr2=1.129&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_connect.cpp.diff?tr1=1.90&tr2=1.91&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/pathfind.cpp.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playlevel.cpp.diff?tr1=1.160&tr2=1.161&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.cpp.diff?tr1=1.289&tr2=1.290&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/preferences.cpp.diff?tr1=1.124&tr2=1.125&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/replay.cpp.diff?tr1=1.84&tr2=1.85&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/sdl_utils.cpp.diff?tr1=1.64&tr2=1.65&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/show_dialog.cpp.diff?tr1=1.102&tr2=1.103&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/sound.cpp.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/team.cpp.diff?tr1=1.73&tr2=1.74&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/terrain.cpp.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit.cpp.diff?tr1=1.104&tr2=1.105&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit_types.cpp.diff?tr1=1.71&tr2=1.72&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/video.cpp.diff?tr1=1.52&tr2=1.53&r1=text&r2=text

Patches:
Index: wesnoth/src/about.cpp
diff -u wesnoth/src/about.cpp:1.85 wesnoth/src/about.cpp:1.86
--- wesnoth/src/about.cpp:1.85  Thu Nov 18 04:08:32 2004
+++ wesnoth/src/about.cpp       Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: about.cpp,v 1.85 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: about.cpp,v 1.86 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -10,7 +10,7 @@
 
    See the COPYING file for more details.
 */
-
+
 #include "global.hpp"
 #include "events.hpp"
 #include "font.hpp"
Index: wesnoth/src/actions.cpp
diff -u wesnoth/src/actions.cpp:1.164 wesnoth/src/actions.cpp:1.165
--- wesnoth/src/actions.cpp:1.164       Thu Nov 18 04:08:32 2004
+++ wesnoth/src/actions.cpp     Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: actions.cpp,v 1.164 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: actions.cpp,v 1.165 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -10,8 +10,8 @@
 
    See the COPYING file for more details.
 */
-
-#include "global.hpp"
+
+#include "global.hpp"
 
 #include "actions.hpp"
 #include "display.hpp"
Index: wesnoth/src/ai.cpp
diff -u wesnoth/src/ai.cpp:1.123 wesnoth/src/ai.cpp:1.124
--- wesnoth/src/ai.cpp:1.123    Thu Nov 18 04:08:32 2004
+++ wesnoth/src/ai.cpp  Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: ai.cpp,v 1.123 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: ai.cpp,v 1.124 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -10,11 +10,11 @@
 
    See the COPYING file for more details.
 */
-
-#include "global.hpp"
-
-#include "actions.hpp"
-#include "ai.hpp"
+
+#include "global.hpp"
+
+#include "actions.hpp"
+#include "ai.hpp"
 #include "ai2.hpp"
 #include "ai_attack.hpp"
 #include "ai_move.hpp"
@@ -190,8 +190,8 @@
        if(name == "sample_ai")
                return new sample_ai(info);
        else if(name == "idle_ai")
-               return new idle_ai(info);
-       else if(name == "ai2")
+               return new idle_ai(info);
+       else if(name == "ai2")
                return new ai2(info);
        else if(name != "")
                lg::err(lg::ai) << "AI not found: '" << name << "'\n";
Index: wesnoth/src/ai2.hpp
diff -u wesnoth/src/ai2.hpp:1.1 wesnoth/src/ai2.hpp:1.2
--- wesnoth/src/ai2.hpp:1.1     Thu Nov 18 13:17:51 2004
+++ wesnoth/src/ai2.hpp Thu Nov 18 22:00:12 2004
@@ -1,17 +1,17 @@
-#ifndef AI2_HPP_INCLUDED
-#define AI2_HPP_INCLUDED
-
-#include "ai_interface.hpp"
-
-class ai2 : public ai_interface
-{
-public:
-       ai2(ai_interface::info& info) : ai_interface(info)
-       {}
-       virtual ~ai2() {}
-       virtual void play_turn() {}
-
-};
-
-
+#ifndef AI2_HPP_INCLUDED
+#define AI2_HPP_INCLUDED
+
+#include "ai_interface.hpp"
+
+class ai2 : public ai_interface
+{
+public:
+       ai2(ai_interface::info& info) : ai_interface(info)
+       {}
+       virtual ~ai2() {}
+       virtual void play_turn() {}
+
+};
+
+
 #endif
\ No newline at end of file
Index: wesnoth/src/ai_attack.cpp
diff -u wesnoth/src/ai_attack.cpp:1.53 wesnoth/src/ai_attack.cpp:1.54
--- wesnoth/src/ai_attack.cpp:1.53      Thu Nov 18 04:08:32 2004
+++ wesnoth/src/ai_attack.cpp   Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: ai_attack.cpp,v 1.53 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: ai_attack.cpp,v 1.54 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -11,8 +11,8 @@
    See the COPYING file for more details.
 */
 
-#include "global.hpp"
-
+#include "global.hpp"
+
 #include "actions.hpp"
 #include "ai_attack.hpp"
 #include "game_config.hpp"
Index: wesnoth/src/ai_move.cpp
diff -u wesnoth/src/ai_move.cpp:1.51 wesnoth/src/ai_move.cpp:1.52
--- wesnoth/src/ai_move.cpp:1.51        Thu Nov 18 04:08:32 2004
+++ wesnoth/src/ai_move.cpp     Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: ai_move.cpp,v 1.51 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: ai_move.cpp,v 1.52 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -9,9 +9,9 @@
    but WITHOUT ANY WARRANTY.
 
    See the COPYING file for more details.
-*/
-
-#include "global.hpp"
+*/
+
+#include "global.hpp"
 
 #include "ai_move.hpp"
 #include "display.hpp"
Index: wesnoth/src/builder.cpp
diff -u wesnoth/src/builder.cpp:1.38 wesnoth/src/builder.cpp:1.39
--- wesnoth/src/builder.cpp:1.38        Thu Nov 18 04:08:32 2004
+++ wesnoth/src/builder.cpp     Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: builder.cpp,v 1.38 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: builder.cpp,v 1.39 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2004 by Philippe Plantier <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -10,7 +10,7 @@
 
    See the COPYING file for more details.
 */
-
+
 #include "global.hpp"
 
 #include "array.hpp"
Index: wesnoth/src/config.cpp
diff -u wesnoth/src/config.cpp:1.112 wesnoth/src/config.cpp:1.113
--- wesnoth/src/config.cpp:1.112        Thu Nov 18 04:08:32 2004
+++ wesnoth/src/config.cpp      Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: config.cpp,v 1.112 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: config.cpp,v 1.113 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -11,7 +11,7 @@
    See the COPYING file for more details.
 */
 
-#include "global.hpp"
+#include "global.hpp"
 
 #include <algorithm>
 #include <cassert>
Index: wesnoth/src/dialogs.cpp
diff -u wesnoth/src/dialogs.cpp:1.70 wesnoth/src/dialogs.cpp:1.71
--- wesnoth/src/dialogs.cpp:1.70        Thu Nov 18 19:21:17 2004
+++ wesnoth/src/dialogs.cpp     Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: dialogs.cpp,v 1.70 2004/11/18 19:21:17 silene Exp $ */
+/* $Id: dialogs.cpp,v 1.71 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -10,8 +10,8 @@
 
    See the COPYING file for more details.
 */
-
-#include "global.hpp"
+
+#include "global.hpp"
 
 #include "dialogs.hpp"
 #include "events.hpp"
Index: wesnoth/src/display.cpp
diff -u wesnoth/src/display.cpp:1.275 wesnoth/src/display.cpp:1.276
--- wesnoth/src/display.cpp:1.275       Thu Nov 18 04:08:32 2004
+++ wesnoth/src/display.cpp     Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: display.cpp,v 1.275 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: display.cpp,v 1.276 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -10,8 +10,8 @@
 
    See the COPYING file for more details.
 */
-
-#include "global.hpp"
+
+#include "global.hpp"
 
 #include "actions.hpp"
 #include "display.hpp"
Index: wesnoth/src/filesystem.cpp
diff -u wesnoth/src/filesystem.cpp:1.48 wesnoth/src/filesystem.cpp:1.49
--- wesnoth/src/filesystem.cpp:1.48     Thu Nov 18 04:08:32 2004
+++ wesnoth/src/filesystem.cpp  Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: filesystem.cpp,v 1.48 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: filesystem.cpp,v 1.49 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -10,7 +10,7 @@
 
    See the COPYING file for more details.
 */
-
+
 #include "global.hpp"
 
 //include files for opendir(3), readdir(3), etc. These files may vary
Index: wesnoth/src/font.cpp
diff -u wesnoth/src/font.cpp:1.91 wesnoth/src/font.cpp:1.92
--- wesnoth/src/font.cpp:1.91   Thu Nov 18 04:08:32 2004
+++ wesnoth/src/font.cpp        Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: font.cpp,v 1.91 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: font.cpp,v 1.92 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -10,8 +10,8 @@
 
    See the COPYING file for more details.
 */
-
-#include "global.hpp"
+
+#include "global.hpp"
 
 #include "config.hpp"
 #include "font.hpp"
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.162 wesnoth/src/game.cpp:1.163
--- wesnoth/src/game.cpp:1.162  Thu Nov 18 04:08:32 2004
+++ wesnoth/src/game.cpp        Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.162 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: game.cpp,v 1.163 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -11,7 +11,7 @@
    See the COPYING file for more details.
 */
 
-#include "global.hpp"
+#include "global.hpp"
 
 #include "SDL.h"
 
@@ -140,7 +140,7 @@
                                                        config snapshot;
 
                                                        
recorder.save_game(units_data,label,snapshot,state.starting_pos);
-                                               } 
catch(gamestatus::save_game_failed& e) {
+                                               } 
catch(gamestatus::save_game_failed& e) {
                                                        e;
                                                        
gui::show_dialog(disp,NULL,"",_("The game could not be saved"),gui::MESSAGE);
                                                        retry = true;
@@ -202,7 +202,7 @@
                                if(should_save == 0) {
                                        try {
                                                save_game(state);
-                                       } catch(gamestatus::save_game_failed& 
e) {
+                                       } catch(gamestatus::save_game_failed& 
e) {
                                                e;
                                                
gui::show_dialog(disp,NULL,"",_("The game could not be saved"),gui::MESSAGE);
                                                retry = true;
@@ -295,7 +295,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) {
+                               } catch(io_exception& e) {
                                        e;
                                        std::cerr << "could not write to cache 
'" << fname << "'\n";
                                }
@@ -833,7 +833,7 @@
                    _("The file you have tried to load is corrupt") + 
std::string(": '") + e.message + "'",
                    gui::OK_ONLY);
                return false;
-       } catch(io_exception& e) {
+       } catch(io_exception& e) {
                e;
                gui::show_dialog(disp(),NULL,"",_("File I/O Error while reading 
the game"),gui::OK_ONLY);
                return false;
@@ -1131,13 +1131,13 @@
                use_caching_ = old_cache;
 
                gui::show_dialog(disp(),NULL,_("Campaign Installed"),_("The 
campaign has been installed."),gui::OK_ONLY);
-       } catch(config::error& e) {
+       } catch(config::error& e) {
                e;
                gui::show_dialog(disp(),NULL,_("Error"),_("Network 
communication error."),gui::OK_ONLY);
-       } catch(network::error& e) {
+       } catch(network::error& e) {
                e;
                gui::show_dialog(disp(),NULL,_("Error"),_("Remote host 
disconnected."),gui::OK_ONLY);
-       } catch(io_exception& e) {
+       } catch(io_exception& e) {
                e;
                gui::show_dialog(disp(),NULL,_("Error"),_("There was a problem 
creating the files necessary to install this campaign."),gui::OK_ONLY);
        }
Index: wesnoth/src/game_config.cpp
diff -u wesnoth/src/game_config.cpp:1.91 wesnoth/src/game_config.cpp:1.92
--- wesnoth/src/game_config.cpp:1.91    Thu Nov 18 04:08:32 2004
+++ wesnoth/src/game_config.cpp Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: game_config.cpp,v 1.91 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: game_config.cpp,v 1.92 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -10,9 +10,9 @@
 
    See the COPYING file for more details.
 */
-
-#include "global.hpp"
-
+
+#include "global.hpp"
+
 #include "game_config.hpp"
 #include "wesconfig.h"
 
Index: wesnoth/src/game_events.cpp
diff -u wesnoth/src/game_events.cpp:1.112 wesnoth/src/game_events.cpp:1.113
--- wesnoth/src/game_events.cpp:1.112   Thu Nov 18 04:08:32 2004
+++ wesnoth/src/game_events.cpp Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: game_events.cpp,v 1.112 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: game_events.cpp,v 1.113 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -10,8 +10,8 @@
 
    See the COPYING file for more details.
 */
-
-#include "global.hpp"
+
+#include "global.hpp"
 
 #include "game_events.hpp"
 #include "image.hpp"
Index: wesnoth/src/gamestatus.cpp
diff -u wesnoth/src/gamestatus.cpp:1.47 wesnoth/src/gamestatus.cpp:1.48
--- wesnoth/src/gamestatus.cpp:1.47     Thu Nov 18 04:08:32 2004
+++ wesnoth/src/gamestatus.cpp  Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: gamestatus.cpp,v 1.47 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: gamestatus.cpp,v 1.48 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -9,9 +9,9 @@
    but WITHOUT ANY WARRANTY.
 
    See the COPYING file for more details.
-*/
-
-#include "global.hpp"
+*/
+
+#include "global.hpp"
 
 #include "filesystem.hpp"
 #include "game_config.hpp"
@@ -469,7 +469,7 @@
                        save_index_cfg.read(read_file(get_save_index_file()));
                } catch(io_exception& e) {
                        std::cerr << "error reading save index: '" << e.what() 
<< "'\n";
-               } catch(config::error& e) {
+               } catch(config::error& e) {
                        e;
                        std::cerr << "error parsing save index config file\n";
                        save_index_cfg.clear();
Index: wesnoth/src/help.cpp
diff -u wesnoth/src/help.cpp:1.54 wesnoth/src/help.cpp:1.55
--- wesnoth/src/help.cpp:1.54   Thu Nov 18 04:08:32 2004
+++ wesnoth/src/help.cpp        Thu Nov 18 22:00:12 2004
@@ -9,8 +9,8 @@
 
    See the COPYING file for more details.
 */
-
-#include "global.hpp"
+
+#include "global.hpp"
 
 #include "about.hpp"
 #include "cursor.hpp"
Index: wesnoth/src/hotkeys.cpp
diff -u wesnoth/src/hotkeys.cpp:1.64 wesnoth/src/hotkeys.cpp:1.65
--- wesnoth/src/hotkeys.cpp:1.64        Thu Nov 18 04:08:32 2004
+++ wesnoth/src/hotkeys.cpp     Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: hotkeys.cpp,v 1.64 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: hotkeys.cpp,v 1.65 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -10,8 +10,8 @@
 
    See the COPYING file for more details.
 */
-
-#include "global.hpp"
+
+#include "global.hpp"
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
Index: wesnoth/src/intro.cpp
diff -u wesnoth/src/intro.cpp:1.63 wesnoth/src/intro.cpp:1.64
--- wesnoth/src/intro.cpp:1.63  Thu Nov 18 04:08:32 2004
+++ wesnoth/src/intro.cpp       Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: intro.cpp,v 1.63 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: intro.cpp,v 1.64 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -9,8 +9,8 @@
    but WITHOUT ANY WARRANTY.
 
    See the COPYING file for more details.
-*/
-
+*/
+
 #include "global.hpp"
 
 #include "events.hpp"
Index: wesnoth/src/key.cpp
diff -u wesnoth/src/key.cpp:1.13 wesnoth/src/key.cpp:1.14
--- wesnoth/src/key.cpp:1.13    Thu Nov 18 04:08:32 2004
+++ wesnoth/src/key.cpp Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: key.cpp,v 1.13 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: key.cpp,v 1.14 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -9,9 +9,9 @@
    but WITHOUT ANY WARRANTY.
 
    See the COPYING file for more details.
-*/
-
-#include "global.hpp"
+*/
+
+#include "global.hpp"
 
 #include "key.hpp"
 
Index: wesnoth/src/language.cpp
diff -u wesnoth/src/language.cpp:1.57 wesnoth/src/language.cpp:1.58
--- wesnoth/src/language.cpp:1.57       Thu Nov 18 04:08:32 2004
+++ wesnoth/src/language.cpp    Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: language.cpp,v 1.57 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: language.cpp,v 1.58 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -10,9 +10,9 @@
 
    See the COPYING file for more details.
 */
-
-#include "global.hpp"
-
+
+#include "global.hpp"
+
 #include "config.hpp"
 #include "font.hpp"
 #include "language.hpp"
Index: wesnoth/src/log.cpp
diff -u wesnoth/src/log.cpp:1.17 wesnoth/src/log.cpp:1.18
--- wesnoth/src/log.cpp:1.17    Thu Nov 18 04:08:32 2004
+++ wesnoth/src/log.cpp Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: log.cpp,v 1.17 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: log.cpp,v 1.18 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
                  2004 by Guillaume Melquiond <address@hidden>
@@ -11,8 +11,8 @@
 
    See the COPYING file for more details.
 */
-
-#include "global.hpp"
+
+#include "global.hpp"
 
 #include "SDL.h"
 
Index: wesnoth/src/map.cpp
diff -u wesnoth/src/map.cpp:1.42 wesnoth/src/map.cpp:1.43
--- wesnoth/src/map.cpp:1.42    Thu Nov 18 04:08:32 2004
+++ wesnoth/src/map.cpp Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: map.cpp,v 1.42 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: map.cpp,v 1.43 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -9,9 +9,9 @@
    but WITHOUT ANY WARRANTY.
 
    See the COPYING file for more details.
-*/
-
-#include "global.hpp"
+*/
+
+#include "global.hpp"
 
 #include "game.hpp"
 #include "map.hpp"
Index: wesnoth/src/mouse.cpp
diff -u wesnoth/src/mouse.cpp:1.11 wesnoth/src/mouse.cpp:1.12
--- wesnoth/src/mouse.cpp:1.11  Thu Nov 18 04:08:32 2004
+++ wesnoth/src/mouse.cpp       Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: mouse.cpp,v 1.11 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: mouse.cpp,v 1.12 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -10,8 +10,8 @@
 
    See the COPYING file for more details.
 */
-
-#include "global.hpp"
+
+#include "global.hpp"
 
 #include "mouse.hpp"
 
Index: wesnoth/src/multiplayer.cpp
diff -u wesnoth/src/multiplayer.cpp:1.128 wesnoth/src/multiplayer.cpp:1.129
--- wesnoth/src/multiplayer.cpp:1.128   Thu Nov 18 04:08:32 2004
+++ wesnoth/src/multiplayer.cpp Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: multiplayer.cpp,v 1.128 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: multiplayer.cpp,v 1.129 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -10,8 +10,8 @@
 
    See the COPYING file for more details.
 */
-
-#include "global.hpp"
+
+#include "global.hpp"
 
 #include "cursor.hpp"
 #include "events.hpp"
Index: wesnoth/src/multiplayer_connect.cpp
diff -u wesnoth/src/multiplayer_connect.cpp:1.90 
wesnoth/src/multiplayer_connect.cpp:1.91
--- wesnoth/src/multiplayer_connect.cpp:1.90    Thu Nov 18 04:08:32 2004
+++ wesnoth/src/multiplayer_connect.cpp Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_connect.cpp,v 1.90 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: multiplayer_connect.cpp,v 1.91 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -10,8 +10,8 @@
 
    See the COPYING file for more details.
 */
-
-#include "global.hpp"
+
+#include "global.hpp"
 
 #include "events.hpp"
 #include "font.hpp"
@@ -642,7 +642,7 @@
                                                }
                                        }
                                }
-                               break;
+                               break;
                        }
                        case 4:
                                combos_type_[n].set_selected(0);
Index: wesnoth/src/pathfind.cpp
diff -u wesnoth/src/pathfind.cpp:1.46 wesnoth/src/pathfind.cpp:1.47
--- wesnoth/src/pathfind.cpp:1.46       Thu Nov 18 04:08:32 2004
+++ wesnoth/src/pathfind.cpp    Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: pathfind.cpp,v 1.46 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: pathfind.cpp,v 1.47 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -10,9 +10,9 @@
 
    See the COPYING file for more details.
 */
-
-#include "global.hpp"
-
+
+#include "global.hpp"
+
 #include "game.hpp"
 #include "pathfind.hpp"
 #include "util.hpp"
Index: wesnoth/src/playlevel.cpp
diff -u wesnoth/src/playlevel.cpp:1.160 wesnoth/src/playlevel.cpp:1.161
--- wesnoth/src/playlevel.cpp:1.160     Thu Nov 18 04:08:32 2004
+++ wesnoth/src/playlevel.cpp   Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: playlevel.cpp,v 1.160 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: playlevel.cpp,v 1.161 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -10,8 +10,8 @@
 
    See the COPYING file for more details.
 */
-
-#include "global.hpp"
+
+#include "global.hpp"
 
 #include "cursor.hpp"
 #include "events.hpp"
@@ -555,7 +555,7 @@
                                        try {
                                                replaying = 
do_replay(gui,map,gameinfo,units,teams,
                                                                      
player_number,status,state_of_game);
-                                       } catch(replay::error& e) {
+                                       } catch(replay::error& e) {
                                                e;
                                                std::cerr << "caught 
replay::error\n";
                                                
gui::show_dialog(gui,NULL,"",_("The file you have tried to load is 
corrupt"),gui::OK_ONLY);
@@ -808,7 +808,7 @@
                        return VICTORY;
                }
        } //end catch
-       catch(replay::error& e) {
+       catch(replay::error& e) {
                e;
                std::cerr << "caught replay::error\n";
                gui::show_dialog(gui,NULL,"",_("The file you have tried to load 
is corrupt"),
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.289 wesnoth/src/playturn.cpp:1.290
--- wesnoth/src/playturn.cpp:1.289      Thu Nov 18 04:08:32 2004
+++ wesnoth/src/playturn.cpp    Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.289 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: playturn.cpp,v 1.290 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -10,8 +10,8 @@
 
    See the COPYING file for more details.
 */
-
-#include "global.hpp"
+
+#include "global.hpp"
 
 #include "actions.hpp"
 #include "events.hpp"
@@ -1147,7 +1147,7 @@
        try {
                config starting_pos;
                
recorder.save_game(gameinfo_,_("Auto-Save"),snapshot,state_of_game_.starting_pos);
-       } catch(gamestatus::save_game_failed& e) {
+       } catch(gamestatus::save_game_failed& e) {
                e;
                gui::show_dialog(gui_,NULL,"",_("Could not auto save the game. 
Please save the game manually."),gui::MESSAGE);
                //do not bother retrying, since the user can just save the game
@@ -1404,7 +1404,7 @@
                        if(dialog_type != gui::NULL_DIALOG) {
                                gui::show_dialog(gui_,NULL,_("Saved"),_("The 
game has been saved"), gui::OK_ONLY);
                        }
-               } catch(gamestatus::save_game_failed& e) {
+               } catch(gamestatus::save_game_failed& e) {
                        e;
                        gui::show_dialog(gui_,NULL,_("Error"),_("The game could 
not be saved"),gui::MESSAGE);
                        //do not bother retrying, since the user can just try 
to save the game again
@@ -2417,14 +2417,14 @@
                        try {
                                turn_end = 
do_replay(gui_,map_,gameinfo_,units_,teams_,
                                team_num_,status_,state_of_game_,&replay_obj);
-                       } catch(replay::error& e) {
-                               e;
-                               //notify remote hosts of out of sync error
-                               config cfg;
-                               config& info = cfg.add_child("info");
-                               info["type"] = "termination";
-                               info["condition"] = "out of sync";
-                               network::send_data(cfg);
+                       } catch(replay::error& e) {
+                               e;
+                               //notify remote hosts of out of sync error
+                               config cfg;
+                               config& info = cfg.add_child("info");
+                               info["type"] = "termination";
+                               info["condition"] = "out of sync";
+                               network::send_data(cfg);
 
                                save_game(_("The games are out of sync and will 
have to exit. Do you want to save an error log of your game?"),gui::YES_NO);
 
@@ -2508,7 +2508,7 @@
 
                        teams_[side].make_human();
                        return PROCESS_RESTART_TURN;
-               }
+               }
 
                throw network::error("");
        }
Index: wesnoth/src/preferences.cpp
diff -u wesnoth/src/preferences.cpp:1.124 wesnoth/src/preferences.cpp:1.125
--- wesnoth/src/preferences.cpp:1.124   Thu Nov 18 04:08:32 2004
+++ wesnoth/src/preferences.cpp Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: preferences.cpp,v 1.124 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: preferences.cpp,v 1.125 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -10,8 +10,8 @@
 
    See the COPYING file for more details.
 */
-
-#include "global.hpp"
+
+#include "global.hpp"
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
Index: wesnoth/src/replay.cpp
diff -u wesnoth/src/replay.cpp:1.84 wesnoth/src/replay.cpp:1.85
--- wesnoth/src/replay.cpp:1.84 Thu Nov 18 04:08:32 2004
+++ wesnoth/src/replay.cpp      Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: replay.cpp,v 1.84 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: replay.cpp,v 1.85 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -9,9 +9,9 @@
    but WITHOUT ANY WARRANTY.
 
    See the COPYING file for more details.
-*/
-
-#include "global.hpp"
+*/
+
+#include "global.hpp"
 
 #include "actions.hpp"
 #include "ai_interface.hpp"
Index: wesnoth/src/sdl_utils.cpp
diff -u wesnoth/src/sdl_utils.cpp:1.64 wesnoth/src/sdl_utils.cpp:1.65
--- wesnoth/src/sdl_utils.cpp:1.64      Thu Nov 18 04:08:32 2004
+++ wesnoth/src/sdl_utils.cpp   Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: sdl_utils.cpp,v 1.64 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: sdl_utils.cpp,v 1.65 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -10,8 +10,8 @@
 
    See the COPYING file for more details.
 */
-
-#include "global.hpp"
+
+#include "global.hpp"
 
 #include <algorithm>
 #include <cmath>
Index: wesnoth/src/show_dialog.cpp
diff -u wesnoth/src/show_dialog.cpp:1.102 wesnoth/src/show_dialog.cpp:1.103
--- wesnoth/src/show_dialog.cpp:1.102   Thu Nov 18 04:08:32 2004
+++ wesnoth/src/show_dialog.cpp Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: show_dialog.cpp,v 1.102 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: show_dialog.cpp,v 1.103 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -10,8 +10,8 @@
 
    See the COPYING file for more details.
 */
-
-#include "global.hpp"
+
+#include "global.hpp"
 
 #include "config.hpp"
 #include "cursor.hpp"
Index: wesnoth/src/sound.cpp
diff -u wesnoth/src/sound.cpp:1.24 wesnoth/src/sound.cpp:1.25
--- wesnoth/src/sound.cpp:1.24  Thu Nov 18 04:08:32 2004
+++ wesnoth/src/sound.cpp       Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: sound.cpp,v 1.24 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: sound.cpp,v 1.25 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -11,7 +11,7 @@
    See the COPYING file for more details.
 */
 
-#include "global.hpp"
+#include "global.hpp"
 
 #include "filesystem.hpp"
 #include "game_config.hpp"
Index: wesnoth/src/team.cpp
diff -u wesnoth/src/team.cpp:1.73 wesnoth/src/team.cpp:1.74
--- wesnoth/src/team.cpp:1.73   Thu Nov 18 04:08:32 2004
+++ wesnoth/src/team.cpp        Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: team.cpp,v 1.73 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: team.cpp,v 1.74 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -10,8 +10,8 @@
 
    See the COPYING file for more details.
 */
-
-#include "global.hpp"
+
+#include "global.hpp"
 
 #include "game_config.hpp"
 #include "game_events.hpp"
Index: wesnoth/src/terrain.cpp
diff -u wesnoth/src/terrain.cpp:1.23 wesnoth/src/terrain.cpp:1.24
--- wesnoth/src/terrain.cpp:1.23        Thu Nov 18 04:08:32 2004
+++ wesnoth/src/terrain.cpp     Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: terrain.cpp,v 1.23 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: terrain.cpp,v 1.24 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -10,8 +10,8 @@
 
    See the COPYING file for more details.
 */
-
-#include "global.hpp"
+
+#include "global.hpp"
 
 #include "terrain.hpp"
 
Index: wesnoth/src/unit.cpp
diff -u wesnoth/src/unit.cpp:1.104 wesnoth/src/unit.cpp:1.105
--- wesnoth/src/unit.cpp:1.104  Thu Nov 18 04:08:32 2004
+++ wesnoth/src/unit.cpp        Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: unit.cpp,v 1.104 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: unit.cpp,v 1.105 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -10,8 +10,8 @@
 
    See the COPYING file for more details.
 */
-
-#include "global.hpp"
+
+#include "global.hpp"
 
 #include "font.hpp"
 #include "game_config.hpp"
Index: wesnoth/src/unit_types.cpp
diff -u wesnoth/src/unit_types.cpp:1.71 wesnoth/src/unit_types.cpp:1.72
--- wesnoth/src/unit_types.cpp:1.71     Thu Nov 18 04:08:32 2004
+++ wesnoth/src/unit_types.cpp  Thu Nov 18 22:00:12 2004
@@ -1,4 +1,4 @@
-/* $Id: unit_types.cpp,v 1.71 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: unit_types.cpp,v 1.72 2004/11/18 22:00:12 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -9,9 +9,9 @@
    but WITHOUT ANY WARRANTY.
 
    See the COPYING file for more details.
-*/
-
-#include "global.hpp"
+*/
+
+#include "global.hpp"
 
 #include "game_config.hpp"
 #include "gamestatus.hpp"
Index: wesnoth/src/video.cpp
diff -u wesnoth/src/video.cpp:1.52 wesnoth/src/video.cpp:1.53
--- wesnoth/src/video.cpp:1.52  Thu Nov 18 04:08:32 2004
+++ wesnoth/src/video.cpp       Thu Nov 18 22:00:13 2004
@@ -1,4 +1,4 @@
-/* $Id: video.cpp,v 1.52 2004/11/18 04:08:32 Sirp Exp $ */
+/* $Id: video.cpp,v 1.53 2004/11/18 22:00:13 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -11,7 +11,7 @@
    See the COPYING file for more details.
 */
 
-#include "global.hpp"
+#include "global.hpp"
 
 #include <stdio.h>
 #include <iostream>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]