From afe4e48a30db63fcc366d19f8560d1ebc39ebc9f Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 7 Feb 2004 16:31:40 +0000 Subject: [PATCH] Falscher Parametertyp behoben, typo bei chance behoben. --- src/common/kernel/spell.c | 4 ++-- src/eressea/Jamfile | 1 + src/eressea/lua/faction.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/common/kernel/spell.c b/src/common/kernel/spell.c index 9950178a1..f7acfa437 100644 --- a/src/common/kernel/spell.c +++ b/src/common/kernel/spell.c @@ -226,7 +226,7 @@ magicanalyse_unit(unit *u, unit *mage, int force) c = (curse*)a->data.v; /* ist der curse schwächer als der Analysezauber, so ergibt sich * mehr als 100% chance und damit immer ein Erfolg. */ - chance = chance = curse_chance(c, force); + chance = curse_chance(c, force); mon = c->duration + (rand()%10) - 5; mon = max(1,mon); @@ -2867,7 +2867,7 @@ typedef struct wallcurse { } wallcurse; void -wall_vigour(curse* c, int delta) +wall_vigour(curse* c, double delta) { wallcurse * wc = (wallcurse*)c->data; assert(wc->buddy->vigour==c->vigour); diff --git a/src/eressea/Jamfile b/src/eressea/Jamfile index 9e2b06fc0..e12d84150 100644 --- a/src/eressea/Jamfile +++ b/src/eressea/Jamfile @@ -31,6 +31,7 @@ LinkLibraries $(LUASERVER) : LINKLIBS on $(SERVER) += -lm ; LINKLIBS on $(LUASERVER) += -L$(LUABIND_ROOT)/lib -llua50 -llualib50 ; LINKLIBS on $(LUASERVER) += -lm -lluabind -ldl -lstdc++ ; +# -Wl,-R,$(HOME)/software/$(HOST)/lib ; if $(HAVE_LUA) { SEARCH_SOURCE += [ FDirName $(SUBDIR) lua ] ; diff --git a/src/eressea/lua/faction.cpp b/src/eressea/lua/faction.cpp index fc1f475a2..f505732b9 100644 --- a/src/eressea/lua/faction.cpp +++ b/src/eressea/lua/faction.cpp @@ -57,13 +57,13 @@ faction_getalliance(const faction& f) { return f.alliance; } +#endif const char * faction_locale(const faction& f) { return locale_name(f.locale); } -#endif void bind_faction(lua_State * L)