mail[Wesnoth-commits] r43703 - in /trunk/src: menu_events.cpp mouse_events.cpp play_controller.cpp whiteboard/manager.hpp


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by gabrielmorin on June 24, 2010 - 23:47:
Author: gabba
Date: Thu Jun 24 23:47:45 2010
New Revision: 43703

URL: http://svn.gna.org/viewcvs/wesnoth?rev=43703&view=rev
Log:
Whiteboard: s/active()/is_active()

Modified:
    trunk/src/menu_events.cpp
    trunk/src/mouse_events.cpp
    trunk/src/play_controller.cpp
    trunk/src/whiteboard/manager.hpp

Modified: trunk/src/menu_events.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/menu_events.cpp?rev=43703&r1=43702&r2=43703&view=diff
==============================================================================
--- trunk/src/menu_events.cpp (original)
+++ trunk/src/menu_events.cpp Thu Jun 24 23:47:45 2010
@@ -3379,8 +3379,8 @@
 }
 
 void console_handler::do_toggle_whiteboard() {
-       resources::whiteboard->set_active(!resources::whiteboard->active());
-       if (resources::whiteboard->active()) {
+       
resources::whiteboard->set_active(!resources::whiteboard->is_active());
+       if (resources::whiteboard->is_active()) {
                print(get_cmd(), _("Whiteboard activated."));
        } else {
                print(get_cmd(), _("Whiteboard deactivated."));

Modified: trunk/src/mouse_events.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/mouse_events.cpp?rev=43703&r1=43702&r2=43703&view=diff
==============================================================================
--- trunk/src/mouse_events.cpp (original)
+++ trunk/src/mouse_events.cpp Thu Jun 24 23:47:45 2010
@@ -230,7 +230,7 @@
 
                                if(!browse) {
                                        gui().set_route(&current_route_);
-                                       if (resources::whiteboard->active()) {
+                                       if 
(resources::whiteboard->is_active()) {
                                                
resources::whiteboard->create_temp_move(current_route_.steps);
                                        }
                                }
@@ -600,12 +600,12 @@
                if (!browse && !commands_disabled && u->side() == 
gui().viewing_side()) {
                        sound::play_UI_sound("select-unit.wav");
 
-                       if (!(resources::whiteboard->active() && 
resources::whiteboard->has_action(*u))) {
+                       if (!(resources::whiteboard->is_active() && 
resources::whiteboard->has_action(*u))) {
                                u->set_selecting();
                                game_events::fire("select", hex);
                        }
 
-                       if (resources::whiteboard->active()) {
+                       if (resources::whiteboard->is_active()) {
                                resources::whiteboard->select_unit(*u);
                        }
                }
@@ -614,7 +614,7 @@
                gui().unhighlight_reach();
                current_paths_ = pathfind::paths();
                current_route_.steps.clear();
-               if (resources::whiteboard->active()) {
+               if (resources::whiteboard->is_active()) {
                        resources::whiteboard->deselect_unit();
                }
        }

Modified: trunk/src/play_controller.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/play_controller.cpp?rev=43703&r1=43702&r2=43703&view=diff
==============================================================================
--- trunk/src/play_controller.cpp (original)
+++ trunk/src/play_controller.cpp Thu Jun 24 23:47:45 2010
@@ -780,7 +780,7 @@
 
        case hotkey::HOTKEY_EXECUTE_NEXT_ACTION:
        case hotkey::HOTKEY_DELETE_LAST_ACTION:
-               return resources::whiteboard->active();
+               return resources::whiteboard->is_active();
 
        default:
                return false;

Modified: trunk/src/whiteboard/manager.hpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/whiteboard/manager.hpp?rev=43703&r1=43702&r2=43703&view=diff
==============================================================================
--- trunk/src/whiteboard/manager.hpp (original)
+++ trunk/src/whiteboard/manager.hpp Thu Jun 24 23:47:45 2010
@@ -48,7 +48,7 @@
        /**
         * Determine whether the whiteboard is activated.
         */
-       bool active() const { return active_; }
+       bool is_active() const { return active_; }
        void set_active(bool active){ active_ = active; }
 
        /**




Related Messages


Powered by MHonArc, Updated Fri Jun 25 00:00:19 2010