[Wesnoth-cvs-commits] wesnoth/src actions.cpp playturn.cpp server/gam...

[Isaac Clerencia]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Isaac Clerencia <address@hidden>        05/08/08 22:59:19

Modified files:
        src            : actions.cpp playturn.cpp 
        src/server     : game.cpp 

Log message:
        dos2unix

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/actions.cpp.diff?tr1=1.233&tr2=1.234&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.cpp.diff?tr1=1.389&tr2=1.390&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/server/game.cpp.diff?tr1=1.43&tr2=1.44&r1=text&r2=text

Patches:
Index: wesnoth/src/actions.cpp
diff -u wesnoth/src/actions.cpp:1.233 wesnoth/src/actions.cpp:1.234
--- wesnoth/src/actions.cpp:1.233       Mon Aug  1 15:18:37 2005
+++ wesnoth/src/actions.cpp     Mon Aug  8 22:59:19 2005
@@ -1,4 +1,4 @@
-/* $Id: actions.cpp,v 1.233 2005/08/01 15:18:37 ott Exp $ */
+/* $Id: actions.cpp,v 1.234 2005/08/08 22:59:19 isaaccp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -1888,10 +1888,10 @@
                disp->invalidate_unit();
                disp->invalidate(steps.back());
        }
-
-       if(move_recorder != NULL) {
-               move_recorder->add_movement(steps.front(),steps.back());
-       }
+
+       if(move_recorder != NULL) {
+               move_recorder->add_movement(steps.front(),steps.back());
+       }
 
        int orig_village_owner = -1;
        if(map.is_village(steps.back())) {
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.389 wesnoth/src/playturn.cpp:1.390
--- wesnoth/src/playturn.cpp:1.389      Mon Aug  1 15:18:37 2005
+++ wesnoth/src/playturn.cpp    Mon Aug  8 22:59:19 2005
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.389 2005/08/01 15:18:37 ott Exp $ */
+/* $Id: playturn.cpp,v 1.390 2005/08/08 22:59:19 isaaccp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -1940,15 +1940,15 @@
                if(msg.empty()) {
                        current_team.spend_gold(u_type->second.cost());
                        statistics::recruit_unit(new_unit);
-                       
-                       clear_undo_stack();
-                       redo_stack_.clear();
-
-                       clear_shroud();
-
-                       gui_.recalculate_minimap();
-                       gui_.invalidate_game_status();
-                       gui_.invalidate_all();
+                       
+                       clear_undo_stack();
+                       redo_stack_.clear();
+
+                       clear_shroud();
+
+                       gui_.recalculate_minimap();
+                       gui_.invalidate_game_status();
+                       gui_.invalidate_all();
                } else {
                        recorder.undo();
                        gui::show_dialog(gui_,NULL,"",msg,gui::OK_ONLY);
@@ -2109,12 +2109,12 @@
                                
current_team.spend_gold(game_config::recall_cost);
 
                                undo_stack_.push_back(undo_action(un,loc,res));
-                               redo_stack_.clear();
-
+                               redo_stack_.clear();
+
                                clear_shroud();
 
                                recall_list.erase(recall_list.begin()+res);
-                               gui_.invalidate_game_status();
+                               gui_.invalidate_game_status();
                                gui_.invalidate_all();
                        }
                }
Index: wesnoth/src/server/game.cpp
diff -u wesnoth/src/server/game.cpp:1.43 wesnoth/src/server/game.cpp:1.44
--- wesnoth/src/server/game.cpp:1.43    Sat Jul 23 17:57:56 2005
+++ wesnoth/src/server/game.cpp Mon Aug  8 22:59:19 2005
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.43 2005/07/23 17:57:56 Sirp Exp $ */
+/* $Id: game.cpp,v 1.44 2005/08/08 22:59:19 isaaccp Exp $ */
 /*
    Copyright (C) 2003-5 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -108,13 +108,13 @@
 
 void game::start_game()
 {
-       started_ = true;
-
-       //set all side controllers to 'human' so that observers will understand 
that they can't
-       //take control of any sides if they happen to have the same name as one 
of the descriptions
-       config::child_itors sides = level_.child_range("side");
-       for(; sides.first != sides.second; ++sides.first) {
-               (**sides.first)["controller"] = "human";
+       started_ = true;
+
+       //set all side controllers to 'human' so that observers will understand 
that they can't
+       //take control of any sides if they happen to have the same name as one 
of the descriptions
+       config::child_itors sides = level_.child_range("side");
+       for(; sides.first != sides.second; ++sides.first) {
+               (**sides.first)["controller"] = "human";
        }
 
        describe_slots();