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

compilation errors

This commit is contained in:
Enno Rehling 2005-10-09 21:48:56 +00:00
parent a521385b13
commit 31e3384165
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/kernel/magic.c
View File

@ -379,12 +379,6 @@ updatespelllist(unit * u)
magic_t gebiet = find_magetype(u); magic_t gebiet = find_magetype(u);
boolean ismonster = u->faction->no==MONSTER_FACTION; boolean ismonster = u->faction->no==MONSTER_FACTION;
/* Nur Orkmagier bekommen den Keuschheitsamulettzauber */
sp = find_spellbyid(SPL_ARTEFAKT_CHASTITYBELT);
if (u->race == new_race[RC_ORC] && !has_spell(u, sp) && sp->level<=sk) {
add_spell(mage, find_spellbyid(SPL_ARTEFAKT_CHASTITYBELT));
}
/* Nur Wyrm-Magier bekommen den Wyrmtransformationszauber */ /* Nur Wyrm-Magier bekommen den Wyrmtransformationszauber */
sp = find_spellbyid(SPL_BECOMEWYRM); sp = find_spellbyid(SPL_BECOMEWYRM);
if (fspecial(u->faction, FS_WYRM) && !has_spell(u, sp) && sp->level<=sk) { if (fspecial(u->faction, FS_WYRM) && !has_spell(u, sp) && sp->level<=sk) {

3
src/eressea/lua/region.cpp
View File

@ -117,12 +117,11 @@ region_getresource(const region& r, const char * type)
} }
static void static void
region_setresource(const region& r, const char * type, int value) region_setresource(region& r, const char * type, int value)
{ {
const resource_type * rtype = rt_find(type); const resource_type * rtype = rt_find(type);
if (rtype==rt_find("money")) rsetmoney(&r, value); if (rtype==rt_find("money")) rsetmoney(&r, value);
if (rtype==rt_find("peasant")) return rsetpeasants(&r, value); if (rtype==rt_find("peasant")) return rsetpeasants(&r, value);
return 0;
} }
static void static void