mail[Wesnoth-commits] r52741 - in /trunk/src/whiteboard: move.cpp suppose_dead.cpp


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

Header


Content

Posted by gabrielmorin on January 22, 2012 - 02:13:
Author: gabba
Date: Sun Jan 22 02:13:03 2012
New Revision: 52741

URL: http://svn.gna.org/viewcvs/wesnoth?rev=52741&view=rev
Log:
Restore network compatibility with RC1 broken by revision #52731

Modified:
    trunk/src/whiteboard/move.cpp
    trunk/src/whiteboard/suppose_dead.cpp

Modified: trunk/src/whiteboard/move.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/whiteboard/move.cpp?rev=52741&r1=52740&r2=52741&view=diff
==============================================================================
--- trunk/src/whiteboard/move.cpp (original)
+++ trunk/src/whiteboard/move.cpp Sun Jan 22 02:13:03 2012
@@ -98,7 +98,7 @@
        , fake_unit_hidden_(false)
 {
        // Construct and validate unit_
-       unit_map::iterator unit_itor = 
resources::units->find(cfg["underlying_id"]);
+       unit_map::iterator unit_itor = resources::units->find(cfg["unit_"]);
        if(unit_itor == resources::units->end())
                throw action::ctor_err("move: Invalid underlying_id");
        unit_underlying_id_ = unit_itor->underlying_id();
@@ -471,7 +471,7 @@
        config final_cfg = action::to_config();
 
        final_cfg["type"]="move";
-       final_cfg["underlying_id"]=static_cast<int>(unit_underlying_id_);
+       final_cfg["unit_"]=static_cast<int>(unit_underlying_id_);
 //     final_cfg["movement_cost_"]=movement_cost_; //Unnecessary
 //     final_cfg["unit_id_"]=unit_id_; //Unnecessary
 

Modified: trunk/src/whiteboard/suppose_dead.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/whiteboard/suppose_dead.cpp?rev=52741&r1=52740&r2=52741&view=diff
==============================================================================
--- trunk/src/whiteboard/suppose_dead.cpp (original)
+++ trunk/src/whiteboard/suppose_dead.cpp Sun Jan 22 02:13:03 2012
@@ -78,7 +78,7 @@
        , valid_(true)
        {
                // Construct and validate unit_
-               unit_map::iterator unit_itor = 
resources::units->find(cfg["underlying_id"]);
+               unit_map::iterator unit_itor = 
resources::units->find(cfg["unit_"]);
                if(unit_itor == resources::units->end())
                        throw action::ctor_err("suppose_dead: Invalid 
underlying_id");
 
@@ -163,7 +163,7 @@
                config final_cfg = action::to_config();
 
                final_cfg["type"]="suppose_dead";
-               
final_cfg["underlying_id"]=static_cast<int>(unit_underlying_id_);
+               final_cfg["unit_"]=static_cast<int>(unit_underlying_id_);
                final_cfg["unit_id_"]=unit_id_;
 
                config loc_cfg;




Related Messages


Powered by MHonArc, Updated Sun Jan 22 13:20:06 2012