From 0248798655bb499b4818109e5847c2b4bb9e34a6 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Wed, 8 Jul 2009 10:39:13 +0000 Subject: [PATCH] - setting lastorders from lua --- src/eressea/tolua/bind_faction.c | 12 +++++++++++- src/scripts/tests.lua | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/eressea/tolua/bind_faction.c b/src/eressea/tolua/bind_faction.c index 098f03d28..e0e597ef0 100644 --- a/src/eressea/tolua/bind_faction.c +++ b/src/eressea/tolua/bind_faction.c @@ -180,6 +180,16 @@ tolua_faction_get_lastturn(lua_State* L) return 1; } +static int +tolua_faction_set_lastturn(lua_State* L) +{ + faction * self = (faction *)tolua_tousertype(L, 1, 0); + if (self) { + self->lastorders = (int)tolua_tonumber(L, 2, self->lastorders); + } + return 0; +} + static int tolua_faction_renumber(lua_State* L) { @@ -463,7 +473,7 @@ tolua_faction_open(lua_State* L) tolua_variable(L, TOLUA_CAST "age", tolua_faction_get_age, tolua_faction_set_age); tolua_variable(L, TOLUA_CAST "options", tolua_faction_get_options, tolua_faction_set_options); tolua_variable(L, TOLUA_CAST "flags", tolua_faction_get_flags, NULL); - tolua_variable(L, TOLUA_CAST "lastturn", tolua_faction_get_lastturn, NULL); + tolua_variable(L, TOLUA_CAST "lastturn", tolua_faction_get_lastturn, tolua_faction_set_lastturn); tolua_function(L, TOLUA_CAST "set_policy", tolua_faction_set_policy); tolua_function(L, TOLUA_CAST "get_policy", tolua_faction_get_policy); diff --git a/src/scripts/tests.lua b/src/scripts/tests.lua index 3d9cf2d97..d5d3d26b8 100644 --- a/src/scripts/tests.lua +++ b/src/scripts/tests.lua @@ -540,7 +540,7 @@ mytests = { ["market"] = test_market } fail = 0 -for k, v in pairs(mytests) do +for k, v in pairs(tests) do local status, err = pcall(v) if not status then fail = fail + 1