Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Enno Rehling 2017-02-11 22:29:02 +01:00
parent f6fcd39293 40de740a0a
commit 422af9dd4d
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bind_building.c
View File

@ -13,7 +13,6 @@ without prior permission by the authors of Eressea.
#include <platform.h> #include <platform.h>
#include "bind_building.h" #include "bind_building.h"
#include "bind_unit.h" #include "bind_unit.h"
#include "bind_dict.h"
#include <kernel/config.h> #include <kernel/config.h>
#include <kernel/unit.h> #include <kernel/unit.h>
@ -41,13 +40,6 @@ int tolua_buildinglist_next(lua_State * L)
return 0; /* no more values to return */ return 0; /* no more values to return */
} }
static int tolua_building_get_objects(lua_State * L)
{
building *self = (building *)tolua_tousertype(L, 1, 0);
tolua_pushusertype(L, (void *)&self->attribs, USERTYPE_DICT);
return 1;
}
static int tolua_building_set_working(lua_State * L) static int tolua_building_set_working(lua_State * L)
{ {
building *self = (building *)tolua_tousertype(L, 1, 0); building *self = (building *)tolua_tousertype(L, 1, 0);
@ -258,7 +250,6 @@ void tolua_building_open(lua_State * L)
tolua_variable(L, TOLUA_CAST "size", tolua_building_get_size, tolua_variable(L, TOLUA_CAST "size", tolua_building_get_size,
tolua_building_set_size); tolua_building_set_size);
tolua_function(L, TOLUA_CAST "get_typename", tolua_building_get_typename); tolua_function(L, TOLUA_CAST "get_typename", tolua_building_get_typename);
tolua_variable(L, TOLUA_CAST "objects", tolua_building_get_objects, 0);
tolua_variable(L, TOLUA_CAST "working", tolua_building_get_working, tolua_building_set_working); tolua_variable(L, TOLUA_CAST "working", tolua_building_get_working, tolua_building_set_working);
} }

10
src/bind_ship.c
View File

@ -13,7 +13,6 @@ without prior permission by the authors of Eressea.
#include <platform.h> #include <platform.h>
#include "bind_ship.h" #include "bind_ship.h"
#include "bind_unit.h" #include "bind_unit.h"
#include "bind_dict.h"
#include "move.h" #include "move.h"
@ -115,13 +114,6 @@ static int tolua_ship_get_units(lua_State * L)
return 1; return 1;
} }
static int tolua_ship_get_objects(lua_State * L)
{
ship *self = (ship *)tolua_tousertype(L, 1, 0);
tolua_pushusertype(L, (void *)&self->attribs, USERTYPE_DICT);
return 1;
}
static int tolua_ship_create(lua_State * L) static int tolua_ship_create(lua_State * L)
{ {
region *r = (region *)tolua_tousertype(L, 1, 0); region *r = (region *)tolua_tousertype(L, 1, 0);
@ -233,8 +225,6 @@ void tolua_ship_open(lua_State * L)
tolua_variable(L, TOLUA_CAST "type", tolua_ship_get_type, 0); tolua_variable(L, TOLUA_CAST "type", tolua_ship_get_type, 0);
tolua_variable(L, TOLUA_CAST "damage", tolua_ship_get_damage, tolua_variable(L, TOLUA_CAST "damage", tolua_ship_get_damage,
tolua_ship_set_damage); tolua_ship_set_damage);
tolua_variable(L, TOLUA_CAST "objects", tolua_ship_get_objects, 0);
tolua_function(L, TOLUA_CAST "create", tolua_ship_create); tolua_function(L, TOLUA_CAST "create", tolua_ship_create);
} }
tolua_endmodule(L); tolua_endmodule(L);