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

always nice to eliminate a few TODO's and kill some bitrot.

This commit is contained in:
Enno Rehling 2014-12-09 23:27:05 +01:00
parent 188e003f7c
commit 0c54c7e32d
4 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bind_faction.c
View File

@ -578,15 +578,6 @@ void tolua_faction_open(lua_State * L)
tolua_function(L, TOLUA_CAST "create", tolua_faction_create); tolua_function(L, TOLUA_CAST "create", tolua_faction_create);
tolua_function(L, TOLUA_CAST "get", tolua_faction_get); tolua_function(L, TOLUA_CAST "get", tolua_faction_get);
tolua_function(L, TOLUA_CAST "destroy", tolua_faction_destroy); tolua_function(L, TOLUA_CAST "destroy", tolua_faction_destroy);
#ifdef TODO
def("faction_origin", &faction_getorigin,
pure_out_value(_2) + pure_out_value(_3)),.def_readwrite("subscription",
&faction::subscription)
.property("x", &faction_getorigin_x, &faction_setorigin_x)
.property("y", &faction_getorigin_y, &faction_setorigin_y)
#endif
tolua_function(L, TOLUA_CAST "add_notice", &tolua_faction_addnotice); tolua_function(L, TOLUA_CAST "add_notice", &tolua_faction_addnotice);
tolua_variable(L, TOLUA_CAST "objects", tolua_faction_get_objects, tolua_variable(L, TOLUA_CAST "objects", tolua_faction_get_objects,

1
src/bind_ship.c
View File

@ -219,7 +219,6 @@ void tolua_ship_open(lua_State * L)
.property("maxsize", &ship_maxsize) .property("maxsize", &ship_maxsize)
.def_readwrite("damage", &ship::damage) .def_readwrite("damage", &ship::damage)
.def_readwrite("size", &ship::size) .def_readwrite("size", &ship::size)
.def_readwrite("coast", &ship::coast)
#endif #endif
tolua_variable(L, TOLUA_CAST "objects", tolua_ship_get_objects, 0); tolua_variable(L, TOLUA_CAST "objects", tolua_ship_get_objects, 0);

5
src/kernel/config.c
View File

@ -1632,9 +1632,6 @@ void kernel_done(void)
gc_done(); gc_done();
} }
/* TODO: soll hier weg */
extern struct attrib_type at_shiptrail;
attrib_type at_germs = { attrib_type at_germs = {
"germs", "germs",
DEFAULT_INIT, DEFAULT_INIT,
@ -2168,6 +2165,7 @@ bool has_limited_skills(const struct unit * u)
void attrib_init(void) void attrib_init(void)
{ {
/* Alle speicherbaren Attribute müssen hier registriert werden */ /* Alle speicherbaren Attribute müssen hier registriert werden */
at_register(&at_speedup);
at_register(&at_shiptrail); at_register(&at_shiptrail);
at_register(&at_familiar); at_register(&at_familiar);
at_register(&at_familiarmage); at_register(&at_familiarmage);
@ -2211,7 +2209,6 @@ void attrib_init(void)
at_register(&at_germs); at_register(&at_germs);
at_deprecate("xontormiaexpress", a_readint); /* required for old datafiles */ at_deprecate("xontormiaexpress", a_readint); /* required for old datafiles */
at_register(&at_speedup);
} }
void kernel_init(void) void kernel_init(void)

1
src/move.h
View File

@ -32,6 +32,7 @@ extern "C" {
struct building_type; struct building_type;
extern struct attrib_type at_speedup; extern struct attrib_type at_speedup;
extern struct attrib_type at_shiptrail;
/* die Zahlen sind genau äquivalent zu den race Flags */ /* die Zahlen sind genau äquivalent zu den race Flags */
#define MV_CANNOTMOVE (1<<5) #define MV_CANNOTMOVE (1<<5)