forked from github/server
Bugfix faction==NULL
This commit is contained in:
parent
aeb249ee6f
commit
7670865a33
|
@ -151,8 +151,12 @@ destroy_unit(unit * u)
|
|||
u->building = clone->building;
|
||||
u->hp = 1;
|
||||
i = u->no;
|
||||
uunhash(u);
|
||||
uunhash(clone);
|
||||
u->no = clone->no;
|
||||
clone->no = i;
|
||||
uhash(u);
|
||||
uhash(clone);
|
||||
set_number(u, 1);
|
||||
set_spellpoints(u, 0);
|
||||
a = a_find(u->attribs, &at_clone);
|
||||
|
@ -170,6 +174,8 @@ destroy_unit(unit * u)
|
|||
scale_number(u, 1);
|
||||
u->race = u->irace = new_race[RC_ZOMBIE];
|
||||
} else {
|
||||
if (u->number) set_number(u, 0);
|
||||
handle_event(&u->attribs, "destroy", u);
|
||||
if (r && rterrain(r) != T_OCEAN)
|
||||
rsetmoney(r, rmoney(r) + get_money(u));
|
||||
dhash(u->no, u->faction);
|
||||
|
@ -179,8 +185,6 @@ destroy_unit(unit * u)
|
|||
if (r) choplist(&r->units, u);
|
||||
u->next = udestroy;
|
||||
udestroy = u;
|
||||
if (u->number) set_number(u, 0);
|
||||
handle_event(&u->attribs, "destroy", u);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -5287,15 +5287,13 @@
|
|||
</locale>
|
||||
</message>
|
||||
|
||||
<message name="entrise">
|
||||
<message name="entrise" section="events">
|
||||
<type>
|
||||
<arg name="region" type="region"></arg>
|
||||
<arg name="amount" type="int"></arg>
|
||||
</type>
|
||||
<locale name="de">
|
||||
<nr section="events">
|
||||
<text>"In $region($region) erschienen die Herren der Bäume."</text>
|
||||
</nr>
|
||||
</locale>
|
||||
<text locale="de">"In $region($region) erschienen die Herren der Bäume."</text>
|
||||
<text locale="en">"In $region($region), the lords of the trees have risen."</text>
|
||||
</message>
|
||||
|
||||
<message name="msg_movement">
|
||||
|
|
Loading…
Reference in New Issue