[Wesnoth-commits] r35014 - /trunk/src/scripting/lua.cpp

[guillaume . melquiond]

Author: silene
Date: Sat Apr 18 16:40:15 2009
New Revision: 35014

URL: http://svn.gna.org/viewcvs/wesnoth?rev=35014&view=rev
Log:
Added some more Lua accessors to team data.

Modified:
    trunk/src/scripting/lua.cpp

Modified: trunk/src/scripting/lua.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/scripting/lua.cpp?rev=35014&r1=35013&r2=35014&view=diff
==============================================================================
--- trunk/src/scripting/lua.cpp (original)
+++ trunk/src/scripting/lua.cpp Sat Apr 18 16:40:15 2009
@@ -260,6 +260,15 @@
        return 0;
 }
 
+#define return_tstring_attrib(name, accessor) \
+       if (strcmp(m, name) == 0) { \
+               new(lua_newuserdata(L, sizeof(t_string))) t_string(accessor); \
+               lua_pushlightuserdata(L, (void *)&tstringKey); \
+               lua_gettable(L, LUA_REGISTRYINDEX); \
+               lua_setmetatable(L, -2); \
+               return 1; \
+       }
+
 #define return_string_attrib(name, accessor) \
        if (strcmp(m, name) == 0) { \
                lua_pushstring(L, accessor.c_str()); \
@@ -270,6 +279,26 @@
        if (strcmp(m, name) == 0) { \
                lua_pushinteger(L, accessor); \
                return 1; \
+       }
+
+#define return_bool_attrib(name, accessor) \
+       if (strcmp(m, name) == 0) { \
+               lua_pushboolean(L, accessor); \
+               return 1; \
+       }
+
+#define modify_int_attrib(name, accessor) \
+       if (strcmp(m, name) == 0) { \
+               int value = luaL_checkint(L, -1); \
+               accessor; \
+               return 0; \
+       }
+
+#define modify_bool_attrib(name, accessor) \
+       if (strcmp(m, name) == 0) { \
+               int value = lua_toboolean(L, -1); \
+               accessor; \
+               return 0; \
        }
 
 /**
@@ -571,6 +600,10 @@
 
        // Find the corresponding attribute.
        return_int_attrib("gold", t.gold());
+       return_tstring_attrib("objectives", t.objectives());
+       return_int_attrib("village_gold", t.village_gold());
+       return_int_attrib("income", t.income());
+       return_bool_attrib("objectives_changed", t.objectives_changed());
        return 0;
 }
 
@@ -585,7 +618,12 @@
        // Hidden metamethod, so arg1 has to be a pointer to a team.
        team &t = **static_cast<team **>(lua_touserdata(L, 1));
        char const *m = luaL_checkstring(L, 2);
-
+       lua_settop(L, 3);
+
+       // Find the corresponding attribute.
+       modify_int_attrib("gold", t.spend_gold(t.gold() - value));
+       modify_int_attrib("village_gold", t.set_village_gold(value));
+       modify_bool_attrib("objectives_changed", if (value) 
t.set_objectives_changed(); else t.reset_objectives_changed());
        return 0;
 }
 


_______________________________________________
Wesnoth-commits mailing list
Wesnoth-commits@gna.org
https://mail.gna.org/listinfo/wesnoth-commits