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

Bug in Untoten-Message 

Bug in Astraler Blick, Zauber disabled
Bug in GIB, wenn Fluch aktiviert
This commit is contained in:
Enno Rehling 2002-07-28 09:45:38 +00:00
parent a70e25ed9c
commit f79c3332eb
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -516,7 +516,7 @@ give_peasants(int n, const item_type * itype, unit * src)
} }
} }
void int
give_item(int want, const item_type * itype, unit * src, unit * dest, const char * cmd) give_item(int want, const item_type * itype, unit * src, unit * dest, const char * cmd)
{ {
short error = 0; short error = 0;
@ -528,13 +528,13 @@ give_item(int want, const item_type * itype, unit * src, unit * dest, const char
if (dest && src->faction != dest->faction && src->faction->age < GIVERESTRICTION) { if (dest && src->faction != dest->faction && src->faction->age < GIVERESTRICTION) {
ADDMSG(&src->faction->msgs, msg_error(src, cmd, "giverestriction", ADDMSG(&src->faction->msgs, msg_error(src, cmd, "giverestriction",
"turns", GIVERESTRICTION)); "turns", GIVERESTRICTION));
return; return -1;
} else if (n == 0) { } else if (n == 0) {
error = 36; error = 36;
} else if (itype->flags & ITF_CURSED) { } else if (itype->flags & ITF_CURSED) {
error = 25; error = 25;
} else if (itype->give && !itype->give(src, dest, itype, n, cmd)) { } else if (itype->give && !itype->give(src, dest, itype, n, cmd)) {
return; return -1;
} else { } else {
int use = new_use_pooled(src, item2resource(itype), GET_SLACK, n); int use = new_use_pooled(src, item2resource(itype), GET_SLACK, n);
if (use<n) use += new_use_pooled(src, item2resource(itype), GET_RESERVE|GET_POOLED_SLACK, n-use); if (use<n) use += new_use_pooled(src, item2resource(itype), GET_RESERVE|GET_POOLED_SLACK, n-use);
@ -561,6 +561,8 @@ TODO: Einen Trigger benutzen!
} }
} }
add_give(src, dest, n, item2resource(itype), cmd, error); add_give(src, dest, n, item2resource(itype), cmd, error);
if (error) return -1;
return;
} }
void void
@ -923,10 +925,10 @@ dogive(region * r, unit * u, strlist * S, boolean liefere, int mode)
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((*itmp)->number, (*itmp)->type, u, u2, S->s);
n = 1; n = 1;
if (give_item((*itmp)->number, (*itmp)->type, u, u2, S->s)==0) continue;
} }
else itmp = &(*itmp)->next; itmp = &(*itmp)->next;
} }
} }
if (!n) cmistake(u, S->s, 38, MSG_COMMERCE); if (!n) cmistake(u, S->s, 38, MSG_COMMERCE);
@ -972,9 +974,9 @@ dogive(region * r, unit * u, strlist * S, boolean liefere, int mode)
if ((*itmp)->number > 0 if ((*itmp)->number > 0
&& (*itmp)->number - new_get_resvalue(u, (*itmp)->type->rtype) > 0) { && (*itmp)->number - new_get_resvalue(u, (*itmp)->type->rtype) > 0) {
n = (*itmp)->number - new_get_resvalue(u, (*itmp)->type->rtype); n = (*itmp)->number - new_get_resvalue(u, (*itmp)->type->rtype);
give_item(n, (*itmp)->type, u, u2, S->s); if (give_item(n, (*itmp)->type, u, u2, S->s)==0) continue;
} }
else itmp = &(*itmp)->next; itmp = &(*itmp)->next;
} }
} }
return; return;

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

@ -6239,6 +6239,8 @@ sp_showastral(castorder *co)
int cast_level = co->level; int cast_level = co->level;
int power = co->force; int power = co->force;
return 0;
switch(getplaneid(r)) { switch(getplaneid(r)) {
case 0: case 0:
rt = r_standard_to_astral(r); rt = r_standard_to_astral(r);

1
src/res/de/messages.xml
View File

@ -5246,6 +5246,7 @@
<message name="undeadrise"> <message name="undeadrise">
<type> <type>
<arg name="region" type="region"></arg> <arg name="region" type="region"></arg>
<arg name="amount" type="int"></arg>
</type> </type>
<locale name="de"> <locale name="de">
<nr section="events"> <nr section="events">