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

Bugfix GIB KRÄUTER

This commit is contained in:
Enno Rehling 2002-10-27 08:51:37 +00:00
parent 773f2f33da
commit 6dcaed1e99
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/gamecode/economy.c
View File

@ -909,6 +909,7 @@ dogive(region * r, unit * u, strlist * S, boolean liefere, int mode)
/* Übergabe aller Kräuter */ /* Übergabe aller Kräuter */
if (findparam(s, u->faction->locale) == P_HERBS) { if (findparam(s, u->faction->locale) == P_HERBS) {
boolean given = false;
if (!(u->race->ec_flags & GIVEITEM)) { if (!(u->race->ec_flags & GIVEITEM)) {
add_message(&u->faction->msgs, add_message(&u->faction->msgs,
msg_error(u, S->s, "race_nogive", "race", u->race)); msg_error(u, S->s, "race_nogive", "race", u->race));
@ -925,22 +926,18 @@ dogive(region * r, unit * u, strlist * S, boolean liefere, int mode)
return; return;
} }
} }
n = 0;
if (u->items) { if (u->items) {
item **itmp=&u->items; item **itmp=&u->items;
while (*itmp) { while (*itmp) {
const herb_type * htype = resource2herb((*itmp)->type->rtype); const herb_type * htype = resource2herb((*itmp)->type->rtype);
if (htype && (*itmp)->number>0) { if (htype && (*itmp)->number>0) {
/* give_item gibt bei erfolg 0 zurück
if (give_item((*itmp)->number, (*itmp)->type, u, u2, S->s)==0) continue; if (give_item((*itmp)->number, (*itmp)->type, u, u2, S->s)==0) continue;
*/ given = true;
give_item((*itmp)->number, (*itmp)->type, u, u2, S->s);
n = 1;
} }
itmp = &(*itmp)->next; itmp = &(*itmp)->next;
} }
} }
if (!n) cmistake(u, S->s, 38, MSG_COMMERCE); if (!given) cmistake(u, S->s, 38, MSG_COMMERCE);
return; return;
} }
if (findparam(s, u->faction->locale) == P_ZAUBER) { if (findparam(s, u->faction->locale) == P_ZAUBER) {