[Wesnoth-commits] r50844 - in /trunk/src/whiteboard: action.cpp side_actions.cpp

[tschmitz . wesnoth]

Author: tschmitz
Date: Fri Aug 19 01:39:04 2011
New Revision: 50844

URL: http://svn.gna.org/viewcvs/wesnoth?rev=50844&view=rev
Log:
Changed action::from_config() to do what its comment says it should do.

Modified:
    trunk/src/whiteboard/action.cpp
    trunk/src/whiteboard/side_actions.cpp

Modified: trunk/src/whiteboard/action.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/whiteboard/action.cpp?rev=50844&r1=50843&r2=50844&view=diff
==============================================================================
--- trunk/src/whiteboard/action.cpp (original)
+++ trunk/src/whiteboard/action.cpp Fri Aug 19 01:39:04 2011
@@ -59,18 +59,20 @@
 {
        std::string type = cfg["type"];
 
-       if(type=="move")
-               return action_ptr(new move(cfg,hidden));
-       else if(type=="attack")
-               return action_ptr(new attack(cfg,hidden));
-       else if(type=="recruit")
-               return action_ptr(new recruit(cfg,hidden));
-       else if(type=="recall")
-               return action_ptr(new recall(cfg,hidden));
-       else if(type=="suppose_dead")
-               return action_ptr(new suppose_dead(cfg,hidden));
+       try {
+               if(type=="move")
+                       return action_ptr(new move(cfg,hidden));
+               else if(type=="attack")
+                       return action_ptr(new attack(cfg,hidden));
+               else if(type=="recruit")
+                       return action_ptr(new recruit(cfg,hidden));
+               else if(type=="recall")
+                       return action_ptr(new recall(cfg,hidden));
+               else if(type=="suppose_dead")
+                       return action_ptr(new suppose_dead(cfg,hidden));
+       } catch(action::ctor_err const&) {}
 
-       throw ctor_err("action: Invalid type");
+       return action_ptr();
 }
 
 void action::hide()

Modified: trunk/src/whiteboard/side_actions.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/whiteboard/side_actions.cpp?rev=50844&r1=50843&r2=50844&view=diff
==============================================================================
--- trunk/src/whiteboard/side_actions.cpp (original)
+++ trunk/src/whiteboard/side_actions.cpp Fri Aug 19 01:39:04 2011
@@ -654,10 +654,9 @@
        {
                size_t turn = cmd["turn"].to_int();
                size_t pos = cmd["pos"].to_int();
-               action_ptr act;
-               try {
-                       act = action::from_config(cmd.child("action"),hidden_);
-               } catch(action::ctor_err const&) {
+               action_ptr act = 
action::from_config(cmd.child("action"),hidden_);
+               if(!act)
+               {
                        ERR_WB << "side_actions::execute_network_command(): 
received invalid action data!\n";
                        return;
                }


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