Author: anonymissimus
Date: Sun Nov 6 16:52:52 2011
New Revision: 51891
URL: http://svn.gna.org/viewcvs/wesnoth?rev=51891&view=rev
Log:
replace wesnoth.unit_image_mods with a proxy field
Modified:
trunk/data/lua/wml-tags.lua
trunk/src/scripting/lua.cpp
Modified: trunk/data/lua/wml-tags.lua
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/lua/wml-tags.lua?rev=51891&r1=51890&r2=51891&view=diff
==============================================================================
--- trunk/data/lua/wml-tags.lua (original)
+++ trunk/data/lua/wml-tags.lua Sun Nov 6 16:52:52 2011
@@ -614,7 +614,6 @@
local pattern = "[^%s,]+"
for current_unit_index, current_unit in ipairs(units) do
if not fire_event or current_unit.valid then
- local effect_mods =
wesnoth.unit_image_mods(current_unit)
local xs, ys = string.gmatch(to_x, pattern),
string.gmatch(to_y, pattern)
local move_string_x = current_unit.x
local move_string_y = current_unit.y
@@ -644,7 +643,7 @@
type = current_unit_cfg.type,
gender = current_unit_cfg.gender,
variation = current_unit_cfg.variation,
- image_mods = effect_mods,
+ image_mods = current_unit.image_mods,
side = current_unit_cfg.side,
x = move_string_x,
y = move_string_y
Modified: trunk/src/scripting/lua.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/scripting/lua.cpp?rev=51891&r1=51890&r2=51891&view=diff
==============================================================================
--- trunk/src/scripting/lua.cpp (original)
+++ trunk/src/scripting/lua.cpp Sun Nov 6 16:52:52 2011
@@ -973,6 +973,7 @@
return_int_attrib("side", u.side());
return_string_attrib("id", u.id());
return_string_attrib("type", u.type_id());
+ return_string_attrib("image_mods", u.effect_image_mods());
return_int_attrib("hitpoints", u.hitpoints());
return_int_attrib("max_hitpoints", u.max_hitpoints());
return_int_attrib("experience", u.experience());
@@ -2527,18 +2528,6 @@
unit const *u = luaW_checkunit(L, 1);
char const *m = luaL_checkstring(L, 2);
lua_pushboolean(L, u->get_ability_bool(m));
- return 1;
-}
-
-/**
- * Returns the EffectWML image modifications affecting the given unit, if any.
- * - Arg 1: unit userdata.
- * - Ret 1: string of image path functions, or an empty string.
- */
-static int intf_unit_image_mods(lua_State *L)
-{
- unit const *u = luaW_checkunit(L, 1);
- lua_pushstring(L, u->effect_image_mods().c_str());
return 1;
}
@@ -3514,7 +3503,6 @@
{ "transform_unit", &intf_transform_unit },
{ "unit_ability", &intf_unit_ability },
{ "unit_defense", &intf_unit_defense },
- { "unit_image_mods", &intf_unit_image_mods },
{ "unit_movement_cost", &intf_unit_movement_cost },
{ "unit_resistance", &intf_unit_resistance },
{ NULL, NULL }
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
