Angepasste Jamfiles

This commit is contained in:
Enno Rehling 2007-02-03 15:26:28 +00:00
parent 91e7829b3c
commit bb374629ba
7 changed files with 21 additions and 30 deletions

View File

@ -17,7 +17,6 @@ SOURCES =
monster.c monster.c
randenc.c randenc.c
report.c report.c
spy.c
study.c study.c
xmlreport.c xmlreport.c
; ;

View File

@ -38,6 +38,7 @@ SOURCES =
save.c save.c
ship.c ship.c
skill.c skill.c
spy.c
spell.c spell.c
teleport.c teleport.c
terrain.c terrain.c

View File

@ -50,12 +50,6 @@
#include <math.h> #include <math.h>
#include <ctype.h> #include <ctype.h>
/* spells includes */
#include <spells/regioncurse.h>
#include <spells/unitcurse.h>
#include <spells/shipcurse.h>
#include <spells/buildingcurse.h>
/* ------------------------------------------------------------- */ /* ------------------------------------------------------------- */
@ -679,16 +673,6 @@ resolve_curse(variant id)
return cfindhash(id.i); return cfindhash(id.i);
} }
void
register_curses(void)
{
register_unitcurse();
register_regioncurse();
register_shipcurse();
register_buildingcurse();
}
static const char * oldnames[MAXCURSE] = { static const char * oldnames[MAXCURSE] = {
"fogtrap", "fogtrap",
"antimagiczone", "antimagiczone",

View File

@ -16,7 +16,10 @@
#include <eressea.h> #include <eressea.h>
#include "spells.h" #include "spells.h"
#include "buildingcurse.h"
#include "regioncurse.h" #include "regioncurse.h"
#include "unitcurse.h"
#include "shipcurse.h"
#include "alp.h" #include "alp.h"
#include "combatspells.h" #include "combatspells.h"
@ -9475,6 +9478,7 @@ init_spells(void)
void void
register_spells(void) register_spells(void)
{ {
/* sp_summon_alp */ /* sp_summon_alp */
register_alp(); register_alp();
/* init_firewall(); */ /* init_firewall(); */
@ -9482,6 +9486,9 @@ register_spells(void)
ct_register(&ct_deathcloud); ct_register(&ct_deathcloud);
at_register(&at_deathcloud_compat); at_register(&at_deathcloud_compat);
register_curses(); register_unitcurse();
register_regioncurse();
register_shipcurse();
register_buildingcurse();
register_function((pf_generic)&sp_wdwpyramid, "wdwpyramid"); register_function((pf_generic)&sp_wdwpyramid, "wdwpyramid");
} }

View File

@ -61,14 +61,14 @@ GMTOOL_SOURCES =
# old eressea server. use only for testing. # old eressea server. use only for testing.
LinkLibraries $(SERVER) : LinkLibraries $(SERVER) :
gamecode kernel items modules attributes spells races triggers util ; gamecode items spells kernel modules attributes races triggers util ;
libxml2 $(SERVER) ; libxml2 $(SERVER) ;
LINKLIBS on $(SERVER) += -lm ; LINKLIBS on $(SERVER) += -lm ;
Main $(SERVER) : $(SERVER_SOURCES) ; Main $(SERVER) : $(SERVER_SOURCES) ;
# eressea-server with lua scripting # eressea-server with lua scripting
LinkLibraries $(LUASERVER) : LinkLibraries $(LUASERVER) :
gamecode kernel items modules attributes spells races triggers util ; gamecode items spells kernel modules attributes races triggers util ;
luabind $(LUASERVER) ; luabind $(LUASERVER) ;
libxml2 $(LUASERVER) ; libxml2 $(LUASERVER) ;
LINKLIBS on $(LUASERVER) += -lm -ldl -lstdc++ ; LINKLIBS on $(LUASERVER) += -lm -ldl -lstdc++ ;
@ -76,7 +76,7 @@ Main $(LUASERVER) : $(LUASERVER_SOURCES) ;
# the curses-based GM tool (now with luabind) # the curses-based GM tool (now with luabind)
LinkLibraries $(GMTOOL) : LinkLibraries $(GMTOOL) :
kernel modules items attributes spells races triggers util ; items spells kernel modules attributes races triggers util ;
luabind $(GMTOOL) ; luabind $(GMTOOL) ;
libxml2 $(GMTOOL) ; libxml2 $(GMTOOL) ;
LINKLIBS on $(GMTOOL) += -lm -lncurses -ldl -lstdc++ ; LINKLIBS on $(GMTOOL) += -lm -lncurses -ldl -lstdc++ ;

View File

@ -22,11 +22,11 @@ SOURCES =
Main mapper : $(SOURCES) ; Main mapper : $(SOURCES) ;
LinkLibraries mapper : LinkLibraries mapper :
gamecode gamecode
items
spells
kernel kernel
modules modules
items
attributes attributes
spells
races races
triggers triggers
util ; util ;

View File

@ -323,8 +323,6 @@ function move_north(u)
end end
function test_monsters() function test_monsters()
read_game("23")
-- magrathea = get_region(-67, -5) -- magrathea = get_region(-67, -5)
local magrathea = get_region(0, 0) local magrathea = get_region(0, 0)
if magrathea ~= nil then if magrathea ~= nil then
@ -411,9 +409,9 @@ end
-- test_movement() -- test_movement()
-- test_fail() -- test_fail()
test_handler() -- test_handler()
-- test_parser() -- test_parser()
-- test_monsters() test_monsters()
-- test_combat() -- test_combat()
-- test_rewards() -- test_rewards()
-- test_give() -- test_give()
@ -423,8 +421,10 @@ test_handler()
-- write_game("../testg.txt") -- write_game("../testg.txt")
-- read_game("../testg.txt") -- read_game("../testg.txt")
run_scripts() if 0==1 then
process_orders() run_scripts()
write_reports() process_orders()
write_reports()
end
-- test_moving() -- test_moving()