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

Falscher Parametertyp behoben, typo bei chance behoben.

This commit is contained in:
Enno Rehling 2004-02-07 16:31:40 +00:00
parent f3f8bd811d
commit afe4e48a30
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/kernel/spell.c
View File

@ -226,7 +226,7 @@ magicanalyse_unit(unit *u, unit *mage, int force)
c = (curse*)a->data.v; c = (curse*)a->data.v;
/* ist der curse schwächer als der Analysezauber, so ergibt sich /* ist der curse schwächer als der Analysezauber, so ergibt sich
* mehr als 100% chance und damit immer ein Erfolg. */ * 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 = c->duration + (rand()%10) - 5;
mon = max(1,mon); mon = max(1,mon);
@ -2867,7 +2867,7 @@ typedef struct wallcurse {
} wallcurse; } wallcurse;
void void
wall_vigour(curse* c, int delta) wall_vigour(curse* c, double delta)
{ {
wallcurse * wc = (wallcurse*)c->data; wallcurse * wc = (wallcurse*)c->data;
assert(wc->buddy->vigour==c->vigour); assert(wc->buddy->vigour==c->vigour);

1
src/eressea/Jamfile
View File

@ -31,6 +31,7 @@ LinkLibraries $(LUASERVER) :
LINKLIBS on $(SERVER) += -lm ; LINKLIBS on $(SERVER) += -lm ;
LINKLIBS on $(LUASERVER) += -L$(LUABIND_ROOT)/lib -llua50 -llualib50 ; LINKLIBS on $(LUASERVER) += -L$(LUABIND_ROOT)/lib -llua50 -llualib50 ;
LINKLIBS on $(LUASERVER) += -lm -lluabind -ldl -lstdc++ ; LINKLIBS on $(LUASERVER) += -lm -lluabind -ldl -lstdc++ ;
# -Wl,-R,$(HOME)/software/$(HOST)/lib ;
if $(HAVE_LUA) { if $(HAVE_LUA) {
SEARCH_SOURCE += [ FDirName $(SUBDIR) lua ] ; SEARCH_SOURCE += [ FDirName $(SUBDIR) lua ] ;

2
src/eressea/lua/faction.cpp
View File

@ -57,13 +57,13 @@ faction_getalliance(const faction& f)
{ {
return f.alliance; return f.alliance;
} }
#endif
const char * const char *
faction_locale(const faction& f) faction_locale(const faction& f)
{ {
return locale_name(f.locale); return locale_name(f.locale);
} }
#endif
void void
bind_faction(lua_State * L) bind_faction(lua_State * L)