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

- stooopider fehler in FAHRE (Neu-AW) 

- Bauernmobs benennen
This commit is contained in:
Enno Rehling 2004-02-29 15:29:27 +00:00
parent d1f42fa634
commit 51614d2eb4
2 changed files with 49 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1720,11 +1720,11 @@ kapitaen(region * r, ship * sh)
} }
/* Segeln, Wandern, Reiten /* Segeln, Wandern, Reiten
* when this routine returns a non-zero value, movement for the region needs * when this routine returns a non-zero value, movement for the region needs
* to be done again because of followers that got new MOVE orders. * to be done again because of followers that got new MOVE orders.
* Setting FL_LONGACTION will prevent a unit from being handled more than once * Setting FL_LONGACTION will prevent a unit from being handled more than once
* by this routine * by this routine
*/ */
static int static int
move(region * r, unit * u, boolean move_on_land) move(region * r, unit * u, boolean move_on_land)
{ {
@ -2235,7 +2235,7 @@ movement(void)
} }
break; break;
} }
if (*up==u) { if (u->region==r) {
/* not moved, use next unit */ /* not moved, use next unit */
up = &u->next; up = &u->next;
} else if (*up && (*up)->region!=r) { } else if (*up && (*up)->region!=r) {

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

@ -4245,6 +4245,7 @@ sp_raisepeasantmob(castorder *co)
assert(rpeasants(r) >= 0); assert(rpeasants(r) >= 0);
u = createunit(r, findfaction(MONSTER_FACTION), n, new_race[RC_PEASANT]); u = createunit(r, findfaction(MONSTER_FACTION), n, new_race[RC_PEASANT]);
set_string(&u->name, "Aufgebrachte Bauern");
guard(u, GUARD_ALL); guard(u, GUARD_ALL);
a = a_new(&at_unitdissolve); a = a_new(&at_unitdissolve);
a->data.ca[0] = 1; /* An rpeasants(r). */ a->data.ca[0] = 1; /* An rpeasants(r). */
@ -4897,6 +4898,7 @@ sp_raisepeasants(castorder *co)
rsetpeasants(r, rpeasants(r) - bauern); rsetpeasants(r, rpeasants(r) - bauern);
u2 = create_unit(r,mage->faction, bauern, new_race[RC_PEASANT], 0,"Wilder Bauernmob",mage); u2 = create_unit(r,mage->faction, bauern, new_race[RC_PEASANT], 0,"Wilder Bauernmob",mage);
set_string(&u2->name, "Erzürnte Bauern");
fset(u2, UFL_LOCKED); fset(u2, UFL_LOCKED);
fset(u2, UFL_PARTEITARNUNG); fset(u2, UFL_PARTEITARNUNG);