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

Bugfix: Zählung der Möglichen Kontrahenten vergisst Versteinerung

This commit is contained in:
Enno Rehling 2004-06-20 07:25:28 +00:00
parent afc42b9c4c
commit 13e019ffee
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1403,12 +1403,12 @@ select_opponent(battle * b, troop at, int minrow, int maxrow)
}
minrow = max(minrow, FIGHT_ROW);
if (dt.fighter!=NULL && dt.index<dt.fighter->alive) {
if (dt.fighter!=NULL && dt.index<dt.fighter->alive-dt.fighter->removed) {
fighter * df = dt.fighter;
int row = get_unitrow(df);
if (row>=minrow && row<=maxrow) {
troop ot = df->person[dt.index].opponent;
if (ot.fighter==NULL || ot.index>=ot.fighter->alive) {
if (ot.fighter==NULL || ot.index>=ot.fighter->alive-ot.fighter->removed) {
df->person[dt.index].opponent = at;
}
return dt;
@ -1418,7 +1418,7 @@ select_opponent(battle * b, troop at, int minrow, int maxrow)
if (dt.fighter!=NULL) {
fighter * df = dt.fighter;
troop ot = df->person[dt.index].opponent;
if (ot.fighter==NULL || ot.index>=ot.fighter->alive) {
if (ot.fighter==NULL || ot.index>=ot.fighter->alive-ot.fighter->removed) {
df->person[dt.index].opponent = at;
}
}