diff --git a/src/eressea/Jamfile b/src/eressea/Jamfile index 8e55c512b..5e79a4417 100644 --- a/src/eressea/Jamfile +++ b/src/eressea/Jamfile @@ -38,8 +38,9 @@ SHARED_BINDINGS = item.cpp ; +Library luabindings : $(SHARED_BINDINGS) ; + LUASERVER_SOURCES = - $(SHARED_BINDINGS) iniparser.c script.cpp gamecode.cpp @@ -49,7 +50,6 @@ LUASERVER_SOURCES = ; GMTOOL_SOURCES = - $(SHARED_BINDINGS) iniparser.c gm.cpp listbox.c @@ -64,11 +64,12 @@ LinkLibraries $(SERVER) : gamecode items spells kernel modules attributes races triggers util ; libxml2 $(SERVER) ; LINKLIBS on $(SERVER) += -lm ; -Main $(SERVER) : $(SERVER_SOURCES) ; +# build disabled: +# Main $(SERVER) : $(SERVER_SOURCES) ; # eressea-server with lua scripting LinkLibraries $(LUASERVER) : - gamecode items spells kernel modules attributes races triggers util ; + luabindings gamecode items spells kernel modules attributes races triggers util ; luabind $(LUASERVER) ; libxml2 $(LUASERVER) ; LINKLIBS on $(LUASERVER) += -lm -ldl -lstdc++ ; @@ -76,7 +77,7 @@ Main $(LUASERVER) : $(LUASERVER_SOURCES) ; # the curses-based GM tool (now with luabind) LinkLibraries $(GMTOOL) : - items spells kernel modules attributes races triggers util ; + luabindings items spells kernel modules attributes races triggers util ; luabind $(GMTOOL) ; libxml2 $(GMTOOL) ; LINKLIBS on $(GMTOOL) += -lm -lncurses -ldl -lstdc++ ; diff --git a/src/eressea/gmtool.c b/src/eressea/gmtool.c index 2f317a9fd..228cb234a 100644 --- a/src/eressea/gmtool.c +++ b/src/eressea/gmtool.c @@ -296,20 +296,6 @@ mr_get(const view * vi, int xofs, int yofs) return vi->regions + xofs + yofs * vi->size.width; } -static coordinate * -point2coor(const point * p, coordinate * c) -{ - int x, y; - assert(p && c); - /* wegen division (-1/2==0): - * verschiebung um (0x200000,0x200000) ins positive */ - x = p->x + TWIDTH*0x200000+TWIDTH*0x100000; - y = p->y + THEIGHT*0x200000; - c->x = (x - y * TWIDTH / 2) / TWIDTH - 0x200000; - c->y = y / THEIGHT - 0x200000; - return c; -} - static point * coor2point(const coordinate * c, point * p) {