upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-01 18:06:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #15429

Browse Source 
2010-01-29T03:11:56Z!ai0867@gmail.com forces the Neutral alignment when it isn't overridden by
SingleUnitWML, assuming the empty/missing alignment specification to be
"invalid". The logic before that commit was also broken, so now we make
sure that empty/missing alignment specifications are ignored (they seem
to be automatically fixed to inherit the unit type's alignment later in
the code).
This commit is contained in:
Ignacio R. Morelle 2010-02-20 01:13:44 +00:00
parent cf9c0044a7
commit 1061590240
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog
View File

@ -14,6 +14,8 @@ Version 1.7.13+svn:
leader (Debian bug #555964)
* Fix bug #15382 (Player doesn't get transported to the next scenario)
* Fix bug #15391 (Warnings in multiplayer games)
* Miscellaneous and bug fixes:
* Fix bug #15429 (Units created by WML can only get the Neutral alignment)
Version 1.7.13-1.8beta6:
* AI:

3
players_changelog
View File

@ -26,6 +26,9 @@ Version 1.7.13-1.8beta6:
* User interface:
* Fold several player groups by default in the lobby.
* Miscellaneous and bugfixes:
* Fix WML-generated units receiving only the Neutral alignment.
Version 1.7.12-1.8beta5:
* Campaigns:

2
src/unit.cpp
View File

@ -492,7 +492,7 @@ unit::unit(unit_map* unitmap, const config& cfg,
alignment_ = unit_type::NEUTRAL;
} else if(cfg["alignment"]=="chaotic") {
alignment_ = unit_type::CHAOTIC;
} else {
} else if(cfg["alignment"]!="") {
alignment_ = unit_type::NEUTRAL;
}