[Wesnoth-commits] r50615 - in /trunk/src: menu_events.cpp menu_events.hpp

[tschmitz . wesnoth]

Author: tschmitz
Date: Sat Aug  6 00:34:07 2011
New Revision: 50615

URL: http://svn.gna.org/viewcvs/wesnoth?rev=50615&view=rev
Log:
Changed do_recruit and do_recall return type. (for whiteboard)

Instead of void, they now return bool indicating success or failure.

Modified:
    trunk/src/menu_events.cpp
    trunk/src/menu_events.hpp

Modified: trunk/src/menu_events.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/menu_events.cpp?rev=50615&r1=50614&r2=50615&view=diff
==============================================================================
--- trunk/src/menu_events.cpp (original)
+++ trunk/src/menu_events.cpp Sat Aug  6 00:34:07 2011
@@ -758,7 +758,7 @@
                do_recruit(last_recruit_, side_num, last_hex);
 }
 
-void menu_handler::do_recruit(const std::string &name, int side_num,
+bool menu_handler::do_recruit(const std::string &name, int side_num,
        const map_location &last_hex)
 {
        team &current_team = teams_[side_num - 1];
@@ -769,7 +769,7 @@
 
        for(std::set<std::string>::const_iterator r = recruits.begin(); ; ++r) {
                if (r == recruits.end()) {
-                       return;
+                       return false;
                }
 
                if (name == *r) {
@@ -785,7 +785,7 @@
                if (u_type->cost() > current_team.gold() - 
resources::whiteboard->get_spent_gold_for(side_num)) {
                        gui2::show_transient_message(gui_->video(), "",
                                _("You don’t have enough gold to recruit that 
unit"));
-                       return;
+                       return false;
                }
        } // end planned unit map scope
 
@@ -799,7 +799,7 @@
        } // end planned unit map scope
        if (!msg.empty()) {
                gui2::show_transient_message(gui_->video(), "", msg);
-               return;
+               return false;
        }
 
        if (!resources::whiteboard->save_recruit(name, side_num, loc)) {
@@ -830,7 +830,9 @@
                gui_->invalidate_game_status();
                gui_->invalidate_all();
                recorder.add_checksum_check(loc);
-       }
+               return true;
+       }
+       return false;
 }
 
 void menu_handler::recall(int side_num, const map_location &last_hex)
@@ -1011,7 +1013,7 @@
        }
 }
 
-void menu_handler::do_recall(const unit& un, int side_num, const map_location& 
recall_location)
+bool menu_handler::do_recall(const unit& un, int side_num, const map_location& 
recall_location)
 {
        team &current_team = teams_[side_num - 1];
        std::vector<unit>& recall_list_team = current_team.recall_list();
@@ -1023,7 +1025,7 @@
        if (it == recall_list_team.end())
        {
                ERR_NG << "menu_handler::do_recall(): Unit doesn't exist in 
recall list.\n";
-               return;
+               return false;
        }
 
        recall_list_team.erase(it);
@@ -1044,6 +1046,7 @@
        gui_->invalidate_game_status();
        gui_->invalidate_all();
        recorder.add_checksum_check(recall_location);
+       return true;
 }
 
 void menu_handler::undo(int side_num)

Modified: trunk/src/menu_events.hpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/menu_events.hpp?rev=50615&r1=50614&r2=50615&view=diff
==============================================================================
--- trunk/src/menu_events.hpp (original)
+++ trunk/src/menu_events.hpp Sat Aug  6 00:34:07 2011
@@ -93,8 +93,10 @@
        { return const_cast<menu_handler *>(this)->current_unit(); }
        void move_unit_to_loc(const unit_map::const_iterator& ui, const 
map_location& target,
                bool continue_move, int side_num, mouse_handler &mousehandler);
-       void do_recruit(const std::string& name, int side_num, const 
map_location& last_hex);
-       void do_recall(const unit& un, int side_num, const map_location& 
recall_location);
+       ///@return Whether or not the recruit was successful
+       bool do_recruit(const std::string& name, int side_num, const 
map_location& last_hex);
+       ///@return Whether or not the recall was successful
+       bool do_recall(const unit& un, int side_num, const map_location& 
recall_location);
        void do_speak();
        void do_search(const std::string& new_search);
        void do_command(const std::string &str);


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