Merge branch 'develop' of github.com:ennorehling/eressea into develop

s/build

@@ -35,6 +35,7 @@ cd $ROOT/$BUILD
 BRANCH=$(git status -s -b | head -1 | cut -d\  -f 2 | sed 's/\..*//')
 if [ "$BRANCH" = "master" ] ; then
 VERSION=$(git describe --match 'v*.*.*' --tags | sed 's/^v//')
+echo "$BRANCH $VERSION"
 cmake -DERESSEA_VERSION="$VERSION" ..
 else
 REV=$(git rev-parse --short HEAD)

share/debian-7_8.supp

@@ -50,11 +50,4 @@
    obj:/usr/lib/x86_64-linux-gnu/liblua5.2.so.0.0.0
    obj:/usr/lib/x86_64-linux-gnu/liblua5.2.so.0.0.0
    fun:lua_isnumber
-   fun:class_index_event
-   obj:/usr/lib/x86_64-linux-gnu/liblua5.2.so.0.0.0
-   obj:/usr/lib/x86_64-linux-gnu/liblua5.2.so.0.0.0
-   obj:/usr/lib/x86_64-linux-gnu/liblua5.2.so.0.0.0
-   obj:/usr/lib/x86_64-linux-gnu/liblua5.2.so.0.0.0
-   obj:/usr/lib/x86_64-linux-gnu/liblua5.2.so.0.0.0
-   obj:/usr/lib/x86_64-linux-gnu/liblua5.2.so.0.0.0
 }

src/helpers.c

@@ -211,43 +211,6 @@ static int lua_callspell(castorder * co, const char *fname)
     return result;
 }
 
-/** callback to initialize a familiar from lua. */
-static int lua_initfamiliar(unit * u)
-{
-    lua_State *L = (lua_State *)global.vm_state;
-    char fname[64];
-    int result = -1;
-
-    strlcpy(fname, "initfamiliar_", sizeof(fname));
-    strlcat(fname, u_race(u)->_name, sizeof(fname));
-
-    lua_getglobal(L, fname);
-    if (lua_isfunction(L, -1)) {
-        tolua_pushusertype(L, u, TOLUA_CAST "unit");
-
-        if (lua_pcall(L, 1, 1, 0) != 0) {
-            const char *error = lua_tostring(L, -1);
-            log_error("familiar(%s) calling '%s': %s.\n", unitname(u), fname, error);
-            lua_pop(L, 1);
-        }
-        else {
-            result = (int)lua_tonumber(L, -1);
-            lua_pop(L, 1);
-        }
-    }
-    else {
-        log_warning("familiar(%s) calling '%s': not a function.\n", unitname(u), fname);
-        lua_pop(L, 1);
-    }
-
-    create_mage(u, M_GRAY);
-
-    strlcpy(fname, u_race(u)->_name, sizeof(fname));
-    strlcat(fname, "_familiar", sizeof(fname));
-    equip_unit(u, get_equipment(fname));
-    return result;
-}
-
 static int
 lua_changeresource(unit * u, const struct resource_type *rtype, int delta)
 {
@@ -281,127 +244,6 @@ lua_changeresource(unit * u, const struct resource_type *rtype, int delta)
     return result;
 }
 
-static int lua_getresource(unit * u, const struct resource_type *rtype)
-{
-    lua_State *L = (lua_State *)global.vm_state;
-    int result = -1;
-    char fname[64];
-
-    strlcpy(fname, rtype->_name, sizeof(fname));
-    strlcat(fname, "_getresource", sizeof(fname));
-
-    lua_getglobal(L, fname);
-    if (lua_isfunction(L, -1)) {
-        tolua_pushusertype(L, u, TOLUA_CAST "unit");
-
-        if (lua_pcall(L, 1, 1, 0) != 0) {
-            const char *error = lua_tostring(L, -1);
-            log_error("get(%s) calling '%s': %s.\n", unitname(u), fname, error);
-            lua_pop(L, 1);
-        }
-        else {
-            result = (int)lua_tonumber(L, -1);
-            lua_pop(L, 1);
-        }
-    }
-    else {
-        log_error("get(%s) calling '%s': not a function.\n", unitname(u), fname);
-        lua_pop(L, 1);
-    }
-
-    return result;
-}
-
-static int
-lua_wage(const region * r, const faction * f, const race * rc, int in_turn)
-{
-    lua_State *L = (lua_State *)global.vm_state;
-    const char *fname = "wage";
-    int result = -1;
-
-    lua_getglobal(L, fname);
-    if (lua_isfunction(L, -1)) {
-        tolua_pushusertype(L, (void *)r, TOLUA_CAST "region");
-        tolua_pushusertype(L, (void *)f, TOLUA_CAST "faction");
-        tolua_pushstring(L, rc ? rc->_name : 0);
-        lua_pushinteger(L, in_turn);
-
-        if (lua_pcall(L, 3, 1, 0) != 0) {
-            const char *error = lua_tostring(L, -1);
-            log_error("wage(%s) calling '%s': %s.\n", regionname(r, NULL), fname, error);
-            lua_pop(L, 1);
-        }
-        else {
-            result = (int)lua_tonumber(L, -1);
-            lua_pop(L, 1);
-        }
-    }
-    else {
-        log_error("wage(%s) calling '%s': not a function.\n", regionname(r, NULL), fname);
-        lua_pop(L, 1);
-    }
-
-    return result;
-}
-
-static int lua_maintenance(const unit * u)
-{
-    lua_State *L = (lua_State *)global.vm_state;
-    const char *fname = "maintenance";
-    int result = -1;
-
-    lua_getglobal(L, fname);
-    if (lua_isfunction(L, -1)) {
-        tolua_pushusertype(L, (void *)u, TOLUA_CAST "unit");
-
-        if (lua_pcall(L, 1, 1, 0) != 0) {
-            const char *error = lua_tostring(L, -1);
-            log_error("maintenance(%s) calling '%s': %s.\n", unitname(u), fname, error);
-            lua_pop(L, 1);
-        }
-        else {
-            result = (int)lua_tonumber(L, -1);
-            lua_pop(L, 1);
-        }
-    }
-    else {
-        log_error("maintenance(%s) calling '%s': not a function.\n", unitname(u), fname);
-        lua_pop(L, 1);
-    }
-
-    return result;
-}
-
-static int lua_equipmentcallback(const struct equipment *eq, unit * u)
-{
-    lua_State *L = (lua_State *)global.vm_state;
-    char fname[64];
-    int result = -1;
-
-    strlcpy(fname, "equip_", sizeof(fname));
-    strlcat(fname, eq->name, sizeof(fname));
-
-    lua_getglobal(L, fname);
-    if (lua_isfunction(L, -1)) {
-        tolua_pushusertype(L, (void *)u, TOLUA_CAST "unit");
-
-        if (lua_pcall(L, 1, 1, 0) != 0) {
-            const char *error = lua_tostring(L, -1);
-            log_error("equip(%s) calling '%s': %s.\n", unitname(u), fname, error);
-            lua_pop(L, 1);
-        }
-        else {
-            result = (int)lua_tonumber(L, -1);
-            lua_pop(L, 1);
-        }
-    }
-    else {
-        log_error("equip(%s) calling '%s': not a function.\n", unitname(u), fname);
-        lua_pop(L, 1);
-    }
-    return result;
-}
-
 /** callback for an item-use function written in lua. */
 static int
 use_item_lua(unit *u, const item_type *itype, int amount, struct order *ord)
@@ -447,7 +289,6 @@ use_item_lua(unit *u, const item_type *itype, int amount, struct order *ord)
     return result;
 }
 
-
 /* compat code for old data files */
 static int caldera_read(trigger *t, struct gamedata *data)
 {
@@ -469,17 +310,10 @@ void register_tolua_helpers(void)
     at_register(&at_building_action);
 
     callbacks.cast_spell = lua_callspell;
-
+    callbacks.use_item = use_item_lua;
-    register_function((pf_generic)lua_initfamiliar, "lua_initfamiliar");
-    register_function((pf_generic)lua_getresource, "lua_getresource");
-    register_function((pf_generic)lua_changeresource, "lua_changeresource");
-    register_function((pf_generic)lua_equipmentcallback, "lua_equip");
-
-    register_function((pf_generic)lua_wage, "lua_wage");
-    register_function((pf_generic)lua_maintenance, "lua_maintenance");
-
-    item_use_fun = use_item_lua;
     res_produce_fun = produce_resource_lua;
     res_limit_fun = limit_resource_lua;
+
+    register_function((pf_generic)lua_changeresource, "lua_changeresource");
     register_item_give(lua_giveitem, "lua_giveitem");
 }

src/kernel/callbacks.h

@@ -24,9 +24,15 @@ extern "C" {
 #endif
 
     struct castorder;
+    struct order;
+    struct unit;
+    struct item_type;
 
     struct callback_struct {
         int (*cast_spell)(struct castorder *co, const char *fname);
+        int (*use_item)(struct unit *u, const struct item_type *itype,
+            int amount, struct order *ord);
+
     };
 
     extern struct callback_struct callbacks;

src/kernel/resources.c

@@ -213,8 +213,6 @@ struct rawmaterial_type *rmt_create(struct resource_type *rtype)
     return rmtype;
 }
 
-int(*item_use_fun)(struct unit *u, const struct item_type *itype, int amount,
-    struct order *ord);
 int(*res_limit_fun)(const struct region *, const struct resource_type *);
 void(*res_produce_fun)(struct region *, const struct resource_type *, int);
 

src/kernel/resources.h

@@ -73,8 +73,6 @@ extern "C" {
 
     extern int(*res_limit_fun)(const struct region *, const struct resource_type *);
     extern void(*res_produce_fun)(struct region *, const struct resource_type *, int);
-    extern int (*item_use_fun)(struct unit *, const struct item_type *, int amount,
-        struct order *ord);
     int limit_resource(const struct region *r, const struct resource_type *rtype);
     void produce_resource(struct region *r, const struct resource_type *rtype, int amount);
 

src/laws.c

@@ -45,6 +45,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* kernel includes */
 #include <kernel/alliance.h>
 #include <kernel/ally.h>
+#include <kernel/callbacks.h>
 #include <kernel/connection.h>
 #include <kernel/curse.h>
 #include <kernel/building.h>
@@ -3218,7 +3219,7 @@ static int use_item(unit * u, const item_type * itype, int amount, struct order
     }
 
     if (itype->flags & ITF_CANUSE) {
-        int result = item_use_fun(u, itype, amount, ord);
+        int result = callbacks.use_item(u, itype, amount, ord);
         if (result > 0) {
             use_pooled(u, itype->rtype, GET_DEFAULT, result);
         }