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

- Zaubersprüche ertrinken nicht mehr

This commit is contained in:
Christian Schlittchen 2002-01-27 10:40:40 +00:00
parent 359e711d4d
commit 233fe1b72b
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/gamecode/laws.c
View File

@ -3334,6 +3334,7 @@ processorders (void)
puts(" - Zerstören, Geben, Rekrutieren, Vergessen"); puts(" - Zerstören, Geben, Rekrutieren, Vergessen");
economics(); economics();
remove_empty_units();
puts(" - Gebäudeunterhalt (1. Versuch)"); puts(" - Gebäudeunterhalt (1. Versuch)");
maintain_buildings(false); maintain_buildings(false);

2
src/common/gamecode/randenc.c
View File

@ -663,7 +663,7 @@ drown(region *r)
unit *u = *up; unit *u = *up;
int amphibian_level = fspecial(u->faction, FS_AMPHIBIAN); int amphibian_level = fspecial(u->faction, FS_AMPHIBIAN);
if (u->ship) { if (u->ship || u->race == new_race[RC_SPELL]) {
up=&u->next; up=&u->next;
continue; continue;
} }

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

@ -2453,8 +2453,8 @@ remove_empty_units_in_region(region *r)
while (*up) { while (*up) {
unit * u = *up; unit * u = *up;
if ((old_race(u->race) != RC_SPELL && u->number <= 0) if ((u->number <= 0 && u->race != new_race[RC_SPELL])
|| (old_race(u->race) == RC_SPELL && u->age <= 0) || (u->age <= 0 && u->race == new_race[RC_SPELL])
|| u->number < 0) { || u->number < 0) {
destroy_unit(u); destroy_unit(u);
} }

8
src/common/kernel/movement.c
View File

@ -2031,14 +2031,6 @@ movement(void)
unit *u = *up; unit *u = *up;
keyword_t kword; keyword_t kword;
/* Sollte hier nicht mehr auftreten */
/*
if(u->no == 0) {
up = &u->next;
continue;
}
*/
if (fval(u, FL_FOLLOWING)) { if (fval(u, FL_FOLLOWING)) {
/* skip all followers */ /* skip all followers */
do { do {