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

Bugfix: Exoten-familiars ohne init-routine

This commit is contained in:
Enno Rehling 2004-02-29 09:39:46 +00:00
parent c0a7762932
commit d65c158e4f
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/kernel/eressea.h
View File

@ -677,6 +677,7 @@ enum {
RC_DOLPHIN, RC_DOLPHIN,
RC_OCEANTURTLE, RC_OCEANTURTLE,
RC_KRAKEN, RC_KRAKEN,
RC_SEASERPENT, RC_SEASERPENT,
RC_SHADOWKNIGHT, /* 51 */ RC_SHADOWKNIGHT, /* 51 */

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

@ -535,16 +535,22 @@ report_effect(region * r, unit * mage, message * seen, message * unseen)
static const race * static const race *
select_familiar(const race * magerace, magic_t magiegebiet) select_familiar(const race * magerace, magic_t magiegebiet)
{ {
const race * retval = NULL;
int rnd = rand()%100; int rnd = rand()%100;
assert(magerace->familiars[0]); assert(magerace->familiars[0]);
do {
if (rnd < 3) { if (rnd < 3) {
/* RC_KRAKEN muß letzter Vertraute sein */ /* RC_KRAKEN muß letzter Vertraute sein */
return new_race[(race_t)(RC_HOUSECAT + rand()%(RC_KRAKEN+1-RC_HOUSECAT))]; int rc = RC_HOUSECAT + rand()%(RC_KRAKEN+1-RC_HOUSECAT);
retval = new_race[rc];
} else if (rnd < 80) { } else if (rnd < 80) {
return magerace->familiars[0]; retval = magerace->familiars[0];
} }
return magerace->familiars[magiegebiet]; retval = magerace->familiars[magiegebiet];
}
while (retval->init_familiar==NULL);
return retval;
} }
/* ------------------------------------------------------------- */ /* ------------------------------------------------------------- */