forked from github/server
* FIX für das neue ZEIGE
This commit is contained in:
parent
3ab91b969d
commit
e3bbb74cb8
|
@ -2103,7 +2103,7 @@ display_item(faction *f, unit *u, const item_type * itype)
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
name = buf;
|
name = buf;
|
||||||
}
|
}
|
||||||
ADDMSG(&f->msgs, msg_message("displayitem", "item description", itype, name));
|
ADDMSG(&f->msgs, msg_message("displayitem", "item description", itype->rtype, name));
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,8 +33,11 @@ typedef struct opstack {
|
||||||
void *
|
void *
|
||||||
opstack_pop(opstack ** stack)
|
opstack_pop(opstack ** stack)
|
||||||
{
|
{
|
||||||
opstack * os = *stack;
|
opstack * os;
|
||||||
void * data;
|
void * data;
|
||||||
|
|
||||||
|
assert(stack);
|
||||||
|
os = *stack;
|
||||||
assert(os);
|
assert(os);
|
||||||
data = os->data;
|
data = os->data;
|
||||||
*stack = os->next;
|
*stack = os->next;
|
||||||
|
|
|
@ -7282,9 +7282,9 @@
|
||||||
<text locale="en">"Life itself touches the world and all beings are healed."</text>
|
<text locale="en">"Life itself touches the world and all beings are healed."</text>
|
||||||
</message>
|
</message>
|
||||||
|
|
||||||
<message name="showitem" section="events">
|
<message name="displayitem" section="events">
|
||||||
<type>
|
<type>
|
||||||
<arg name="item" type="item"></arg>
|
<arg name="item" type="resource"></arg>
|
||||||
<arg name="description" type="string"></arg>
|
<arg name="description" type="string"></arg>
|
||||||
</type>
|
</type>
|
||||||
<text locale="de">"$resource($item,1): $description"</text>
|
<text locale="de">"$resource($item,1): $description"</text>
|
||||||
|
|
Loading…
Reference in New Issue