[Wesnoth-cvs-commits] wesnoth/src actions.cpp ai.cpp dialogs.cpp play...

[Guillaume Melquiond]

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

Modified files:
        src            : actions.cpp ai.cpp dialogs.cpp playturn.cpp 
                         playturn.hpp 

Log message:
        Remove unused parameter.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/actions.cpp.diff?tr1=1.165&tr2=1.166&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/ai.cpp.diff?tr1=1.124&tr2=1.125&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/dialogs.cpp.diff?tr1=1.71&tr2=1.72&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.cpp.diff?tr1=1.291&tr2=1.292&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.hpp.diff?tr1=1.52&tr2=1.53&r1=text&r2=text

Patches:
Index: wesnoth/src/actions.cpp
diff -u wesnoth/src/actions.cpp:1.165 wesnoth/src/actions.cpp:1.166
--- wesnoth/src/actions.cpp:1.165       Thu Nov 18 22:00:12 2004
+++ wesnoth/src/actions.cpp     Sun Nov 21 21:15:56 2004
@@ -1,4 +1,4 @@
-/* $Id: actions.cpp,v 1.165 2004/11/18 22:00:12 ydirson Exp $ */
+/* $Id: actions.cpp,v 1.166 2004/11/21 21:15:56 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -80,7 +80,7 @@
        std::map<gamemap::location,unit>& units, unit& new_unit,
        gamemap::location& recruit_location, display* disp, bool need_castle, 
bool full_movement)
 {
-       const command_disabler disable_commands(disp);
+       const command_disabler disable_commands;
 
        LOG_NG << "recruiting unit for side " << side << "\n";
        typedef std::map<gamemap::location,unit> units_map;
@@ -570,7 +570,7 @@
                        const game_data& info, bool player_is_attacker)
 {
        //stop the user from issuing any commands while the units are fighting
-       const command_disabler disable_commands(&gui);
+       const command_disabler disable_commands;
 
        std::map<gamemap::location,unit>::iterator a = units.find(attacker);
        std::map<gamemap::location,unit>::iterator d = units.find(defender);
@@ -1578,7 +1578,7 @@
                  gamemap::location *next_unit, bool continue_move)
 {
        //stop the user from issuing any commands while the unit is moving
-       const command_disabler disable_commands(disp);
+       const command_disabler disable_commands;
 
        assert(!route.empty());
 
Index: wesnoth/src/ai.cpp
diff -u wesnoth/src/ai.cpp:1.124 wesnoth/src/ai.cpp:1.125
--- wesnoth/src/ai.cpp:1.124    Thu Nov 18 22:00:12 2004
+++ wesnoth/src/ai.cpp  Sun Nov 21 21:15:56 2004
@@ -1,4 +1,4 @@
-/* $Id: ai.cpp,v 1.124 2004/11/18 22:00:12 ydirson Exp $ */
+/* $Id: ai.cpp,v 1.125 2004/11/21 21:15:56 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -347,7 +347,7 @@
        LOG_AI << "ai_interface::move_unit " << (from.x + 1) << "," << (from.y 
+ 1)
                << " -> " << (to.x + 1) << "," << (to.y + 1) << "\n";
        //stop the user from issuing any commands while the unit is moving
-       const command_disabler disable_commands(&info_.disp);
+       const command_disabler disable_commands;
 
        assert(info_.units.find(to) == info_.units.end() || from == to);
 
@@ -913,7 +913,7 @@
 void ai_interface::attack_enemy(const location& u, const location& target, int 
weapon)
 {
        //stop the user from issuing any commands while the unit is attacking
-       const command_disabler disable_commands(&info_.disp);
+       const command_disabler disable_commands;
 
        if(info_.units.count(u) && info_.units.count(target)) {
                if(info_.units.find(target)->second.stone()) {
Index: wesnoth/src/dialogs.cpp
diff -u wesnoth/src/dialogs.cpp:1.71 wesnoth/src/dialogs.cpp:1.72
--- wesnoth/src/dialogs.cpp:1.71        Thu Nov 18 22:00:12 2004
+++ wesnoth/src/dialogs.cpp     Sun Nov 21 21:15:56 2004
@@ -1,4 +1,4 @@
-/* $Id: dialogs.cpp,v 1.71 2004/11/18 22:00:12 ydirson Exp $ */
+/* $Id: dialogs.cpp,v 1.72 2004/11/21 21:15:56 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -102,7 +102,7 @@
 
 bool animate_unit_advancement(const game_data& info,unit_map& units, 
gamemap::location loc, display& gui, size_t choice)
 {
-       const command_disabler cmd_disabler(&gui);
+       const command_disabler cmd_disabler;
        
        std::map<gamemap::location,unit>::iterator u = units.find(loc);
        if(u == units.end() || u->second.advances() == false) {
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.291 wesnoth/src/playturn.cpp:1.292
--- wesnoth/src/playturn.cpp:1.291      Sun Nov 21 21:00:08 2004
+++ wesnoth/src/playturn.cpp    Sun Nov 21 21:15:56 2004
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.291 2004/11/21 21:00:08 silene Exp $ */
+/* $Id: playturn.cpp,v 1.292 2004/11/21 21:15:56 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -44,7 +44,7 @@
        int commands_disabled = 0;
 }
 
-command_disabler::command_disabler(display* disp)
+command_disabler::command_disabler()
 {
        ++commands_disabled;
 }
@@ -1188,7 +1188,7 @@
        if(undo_stack_.empty())
                return;
 
-       const command_disabler disable_commands(&gui_);
+       const command_disabler disable_commands;
 
        undo_action& action = undo_stack_.back();
        if(action.is_recall()) {
@@ -1265,7 +1265,7 @@
        if(redo_stack_.empty())
                return;
 
-       const command_disabler disable_commands(&gui_);
+       const command_disabler disable_commands;
 
        //clear routes, selected hex, etc
        gui_.set_paths(NULL);
Index: wesnoth/src/playturn.hpp
diff -u wesnoth/src/playturn.hpp:1.52 wesnoth/src/playturn.hpp:1.53
--- wesnoth/src/playturn.hpp:1.52       Sat Sep 11 02:55:46 2004
+++ wesnoth/src/playturn.hpp    Sun Nov 21 21:15:56 2004
@@ -1,4 +1,4 @@
-/* $Id: playturn.hpp,v 1.52 2004/09/11 02:55:46 Sirp Exp $ */
+/* $Id: playturn.hpp,v 1.53 2004/11/21 21:15:56 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -53,7 +53,7 @@
 
 struct command_disabler
 {
-       command_disabler(display* disp);
+       command_disabler();
        ~command_disabler();
 };