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

use-funcktionen sollten 0 zurücklieern, wenn erfolgreich. fehler in hellebarden-konversion

This commit is contained in:
Enno Rehling 2004-06-12 08:13:14 +00:00
parent 2d379057d4
commit e8138e4dee
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3516,10 +3516,10 @@ use(void)
itype = finditemtype(t, u->faction->locale);
if (itype!=NULL) {
int i = use_item(u, itype, n, S->s);
assert(i<=0);
int i = use_item(u, itype, n, S->s);
assert(i<=0 || !"use_item should not return positive values.");
} else {
cmistake(u, S->s, 43, MSG_PRODUCE);
cmistake(u, S->s, 43, MSG_PRODUCE);
}
}
}

20
src/common/items/artrewards.c
View File

@ -127,13 +127,13 @@ use_trappedairelemental(struct unit * u, const struct item_type * itype,
shipId = getshipid();
if(shipId <= 0) {
cmistake(u, cm, 20, MSG_MOVE);
return 0;
return -1;
}
sh = findshipr(u->region, shipId);
if(!sh) {
cmistake(u, cm, 20, MSG_MOVE);
return 0;
return -1;
}
c = create_curse(u, &sh->attribs, ct_find("shipspeedup"),
@ -145,7 +145,7 @@ use_trappedairelemental(struct unit * u, const struct item_type * itype,
itype->rtype->uchange(u, itype->rtype, -1);
return 1;
return 0;
}
static resource_type rt_trappedairelemental = {
@ -171,7 +171,7 @@ use_aurapotion50(struct unit * u, const struct item_type * itype,
{
if(!is_mage(u)) {
cmistake(u, cm, 214, MSG_MAGIC);
return 0;
return -1;
}
change_spellpoints(u, 50);
@ -181,7 +181,7 @@ use_aurapotion50(struct unit * u, const struct item_type * itype,
itype->rtype->uchange(u, itype->rtype, -1);
return 1;
return 0;
}
static resource_type rt_aurapotion50 = {
@ -211,7 +211,7 @@ use_bagpipeoffear(struct unit * u, const struct item_type * itype,
if(get_curse(u->region->attribs, ct_find("depression"))) {
cmistake(u, cm, 58, MSG_MAGIC);
return 0;
return -1;
}
money = entertainmoney(u->region)/BAGPIPEFRACTION;
@ -254,7 +254,7 @@ use_instantartacademy(struct unit * u, const struct item_type * itype,
if(u->region->land == NULL) {
cmistake(u, cm, 242, MSG_MAGIC);
return 0;
return -1;
}
b = new_building(bt_find("artacademy"), u->region, u->faction->locale);
@ -267,7 +267,7 @@ use_instantartacademy(struct unit * u, const struct item_type * itype,
itype->rtype->uchange(u, itype->rtype, -1);
return 1;
return 0;
}
static resource_type rt_instantartacademy = {
@ -294,7 +294,7 @@ use_instantartsculpture(struct unit * u, const struct item_type * itype,
if(u->region->land == NULL) {
cmistake(u, cm, 242, MSG_MAGIC);
return 0;
return -1;
}
b = new_building(bt_find("artsculpture"), u->region, u->faction->locale);
@ -307,7 +307,7 @@ use_instantartsculpture(struct unit * u, const struct item_type * itype,
itype->rtype->uchange(u, itype->rtype, -1);
return 1;
return 0;
}
static resource_type rt_instantartsculpture = {

1
src/common/kernel/item.h
View File

@ -430,7 +430,6 @@ enum {
R_EOGCHAIN,
R_EOG,
R_SHIELD,
R_HALBEARD,
R_LANCE,
R_MALLORN,
R_KEKS,