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

max number of weapon types was too few.

This commit is contained in:
Enno Rehling 2006-10-29 11:57:03 +00:00
parent 22c6dd08a7
commit 8fb509140c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2892,7 +2892,7 @@ weapon_weight(const weapon * w, boolean missile)
fighter * fighter *
make_fighter(battle * b, unit * u, side * s1, boolean attack) make_fighter(battle * b, unit * u, side * s1, boolean attack)
{ {
#define WMAX 16 #define WMAX 20
weapon weapons[WMAX]; weapon weapons[WMAX];
int owp[WMAX]; int owp[WMAX];
int dwp[WMAX]; int dwp[WMAX];
@ -3043,7 +3043,7 @@ make_fighter(battle * b, unit * u, side * s1, boolean attack)
* ihr kämpfen könnten, und was ihr Wert darin ist. */ * ihr kämpfen könnten, und was ihr Wert darin ist. */
if (u->race->battle_flags & BF_EQUIPMENT) { if (u->race->battle_flags & BF_EQUIPMENT) {
int oi=0, di=0; int oi=0, di=0;
for (itm=u->items;itm;itm=itm->next) { for (itm=u->items;itm && w!=WMAX;itm=itm->next) {
const weapon_type * wtype = resource2weapon(itm->type->rtype); const weapon_type * wtype = resource2weapon(itm->type->rtype);
if (wtype==NULL || itm->number==0) continue; if (wtype==NULL || itm->number==0) continue;
weapons[w].attackskill = weapon_skill(wtype, u, true); weapons[w].attackskill = weapon_skill(wtype, u, true);
@ -3052,6 +3052,7 @@ make_fighter(battle * b, unit * u, side * s1, boolean attack)
weapons[w].used = 0; weapons[w].used = 0;
weapons[w].count = itm->number; weapons[w].count = itm->number;
++w; ++w;
assert(w!=WMAX);
} }
fig->weapons = calloc(sizeof(weapon), w+1); fig->weapons = calloc(sizeof(weapon), w+1);
memcpy(fig->weapons, weapons, w*sizeof(weapon)); memcpy(fig->weapons, weapons, w*sizeof(weapon));