Author: boucman
Date: Mon Mar 7 22:30:37 2011
New Revision: 48822
URL: http://svn.gna.org/viewcvs/wesnoth?rev=48822&view=rev
Log:
fix bug #17845: unit facing is randomized even when forced by WML
Modified:
trunk/src/unit.cpp
trunk/src/unit_display.cpp
Modified: trunk/src/unit.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit.cpp?rev=48822&r1=48821&r2=48822&view=diff
==============================================================================
--- trunk/src/unit.cpp (original)
+++ trunk/src/unit.cpp Mon Mar 7 22:30:37 2011
@@ -232,7 +232,7 @@
role_(cfg["role"]),
ai_special_(cfg["ai_special"]),
attacks_(),
- facing_(map_location::SOUTH_EAST),
+ facing_(map_location::NDIRECTIONS),
trait_names_(),
trait_descriptions_(),
unit_value_(),
@@ -278,7 +278,7 @@
}
facing_ = map_location::parse_direction(cfg["facing"]);
- if(facing_ == map_location::NDIRECTIONS) facing_ =
map_location::SOUTH_EAST;
+ if(facing_ == map_location::NDIRECTIONS) facing_ =
static_cast<map_location::DIRECTION>(rand()%map_location::NDIRECTIONS);
if (const config &mods = cfg.child("modifications")) {
modifications_ = mods;
@@ -576,7 +576,7 @@
role_(),
ai_special_(),
attacks_(),
- facing_(map_location::SOUTH_EAST),
+
facing_(static_cast<map_location::DIRECTION>(rand()%map_location::NDIRECTIONS)),
trait_names_(),
trait_descriptions_(),
unit_value_(),
Modified: trunk/src/unit_display.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_display.cpp?rev=48822&r1=48821&r2=48822&view=diff
==============================================================================
--- trunk/src/unit_display.cpp (original)
+++ trunk/src/unit_display.cpp Mon Mar 7 22:30:37 2011
@@ -454,7 +454,6 @@
disp->draw();
u->set_hidden(false);
-
u->set_facing(static_cast<map_location::DIRECTION>(rand()%map_location::NDIRECTIONS));
animator.add_animation(&*u, "recruited", loc, leader_loc);
animator.start_animations();
animator.wait_for_end();
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
