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

calling remove_unit() instead of set_number() in tidal waves.

Browse source
This commit is contained in:
Enno Rehling 2008-08-28 18:03:33 +00:00
parent 7114b4f467
commit 3c0d17e568
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/common/gamecode/randenc.c
View file

@ -427,13 +427,11 @@ chaosterrain(void)
void void
chaos(region * r) chaos(region * r)
{ {
unit *u = NULL, *u2;
if (rng_int() % 100 < 8) { if (rng_int() % 100 < 8) {
switch (rng_int() % 3) { switch (rng_int() % 3) {
case 0: /* Untote */ case 0: /* Untote */
if (!fval(r->terrain, SEA_REGION)) { if (!fval(r->terrain, SEA_REGION)) {
u = random_unit(r); unit * u = random_unit(r);
if (u && playerrace(u->race)) { if (u && playerrace(u->race)) {
ADDMSG(&u->faction->msgs, msg_message("chaos_disease", "unit", u)); ADDMSG(&u->faction->msgs, msg_message("chaos_disease", "unit", u));
u_setfaction(u, get_monsters()); u_setfaction(u, get_monsters());
@ -444,6 +442,7 @@ chaos(region * r)
case 1: /* Drachen */ case 1: /* Drachen */
if (random_unit(r)) { if (random_unit(r)) {
int mfac = 0; int mfac = 0;
unit * u;
switch (rng_int() % 3) { switch (rng_int() % 3) {
case 0: case 0:
mfac = 100; mfac = 100;
@ -453,7 +452,7 @@ chaos(region * r)
mfac = 500; mfac = 500;
u = createunit(r, get_monsters(), rng_int() % 4 + 1, new_race[RC_DRAGON]); u = createunit(r, get_monsters(), rng_int() % 4 + 1, new_race[RC_DRAGON]);
break; break;
case 2: default:
mfac = 1000; mfac = 1000;
u = createunit(r, get_monsters(), rng_int() % 2 + 1, new_race[RC_WYRM]); u = createunit(r, get_monsters(), rng_int() % 2 + 1, new_race[RC_WYRM]);
break; break;
@ -471,6 +470,8 @@ chaos(region * r)
} }
if (dir!=MAXDIRECTIONS) { if (dir!=MAXDIRECTIONS) {
ship * sh = r->ships; ship * sh = r->ships;
unit ** up;
while (sh) { while (sh) {
ship * nsh = sh->next; ship * nsh = sh->next;
damage_ship(sh, 0.50); damage_ship(sh, 0.50);
@ -480,13 +481,13 @@ chaos(region * r)
sh = nsh; sh = nsh;
} }
for (u = r->units; u;) { for (up = &r->units; *up;) {
u2 = u->next; unit * u = *up;
if (u->race != new_race[RC_SPELL] && u->ship == 0 && !canfly(u)) { if (u->race != new_race[RC_SPELL] && u->ship == 0 && !canfly(u)) {
ADDMSG(&u->faction->msgs, msg_message("tidalwave_kill", "region unit", r, u)); ADDMSG(&u->faction->msgs, msg_message("tidalwave_kill", "region unit", r, u));
set_number(u, 0); remove_unit(up, u);
} }
u = u2; if (*up==u) up = &u->next;
} }
ADDMSG(&r->msgs, msg_message("tidalwave", "region", r)); ADDMSG(&r->msgs, msg_message("tidalwave", "region", r));