upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-30 11:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixup 601c67d970c2eac

Browse Source 
Turns out that commit broke TC on unit images in messages since it broke the equality
check in lua_unit.cpp. Added the XBRZ IPF as part of the Lua unit portrait attribute
instead.

I *think* this is the proper place to do it.

(cherry-picked from commit 98ed802290fb987fc106300a8b6414420e13ba2a)
This commit is contained in:
Charles Dang 2018-04-17 10:15:26 +11:00
parent 723a8bf0a9
commit 33be7d5a8c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/scripting/lua_unit.cpp
View File

@ -364,7 +364,9 @@ static int impl_unit_get(lua_State *L)
return_string_attrib("variation", u.variation());
return_bool_attrib("zoc", u.get_emit_zoc());
return_string_attrib("facing", map_location::write_direction(u.facing()));
return_string_attrib("portrait", u.big_profile() == u.absolute_image() ? u.absolute_image() + u.image_mods() : u.big_profile());
return_string_attrib("portrait", u.big_profile() == u.absolute_image()
? u.absolute_image() + u.image_mods() + "~XBRZ(2)"
: u.big_profile());
return_cfg_attrib("__cfg", u.write(cfg); u.get_location().write(cfg));
if(luaW_getmetafield(L, 1, m)) {

2
src/units/unit.cpp
View File

@ -1015,7 +1015,7 @@ std::string unit::big_profile() const
return profile_;
}
return absolute_image() + "~XBRZ(2)";
return absolute_image();
}
std::string unit::small_profile() const