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

http://bugs.eressea.de/view.php?id=1471 

"Vertrauter verschwindet spurlos"
telling players some more about tidal waves
Issue: 1471
This commit is contained in:
Enno Rehling 2008-08-28 17:58:54 +00:00
parent 802b9332c7
commit 7114b4f467
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/gamecode/randenc.c
View File

@ -482,7 +482,8 @@ chaos(region * r)
for (u = r->units; u;) {
u2 = u->next;
if (u->race != new_race[RC_SPELL] && u->ship == 0) {
if (u->race != new_race[RC_SPELL] && u->ship == 0 && !canfly(u)) {
ADDMSG(&u->faction->msgs, msg_message("tidalwave_kill", "region unit", r, u));
set_number(u, 0);
}
u = u2;

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

@ -1053,6 +1053,8 @@ set_number(unit * u, int count)
u->faction->num_people += count - u->number;
}
u->number = (unsigned short)count;
} else {
assert(!"why doesn't this unit have a faction? this will fuck up num_people");
}
}

9
src/res/messages.xml
View File

@ -7905,6 +7905,15 @@
<text locale="en">"A tidal wave wipes out $region($region) and all who lived there."</text>
</message>
<message name="tidalwave_kill" section="events">
<type>
<arg name="region" type="region"/>
<arg name="unit" type="unit"/>
</type>
<text locale="de">"Eine gewaltige Flutwelle verschlingt $unit($unit) in $region($region)."</text>
<text locale="en">"A tidal wave wipes out $region($region) and kills $unit($unit)."</text>
</message>
<message name="astralshield_activate" section="events">
<type>
<arg name="region" type="region"/>