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

Unicode WIP:

Browse source 
some message-fixes, building types that had been broken since forever, small stuff
This commit is contained in:
Enno Rehling 2007-08-12 13:56:59 +00:00
parent dbfb50625e
commit 77bb331bc5
5 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/common/gamecode/laws.c
View file

@ -1485,6 +1485,7 @@ name_cmd(unit * u, struct order * ord)
}
s = &b->name;
} else {
// TODO: building types static speichern um lookups zu sparen
if (!b) {
cmistake(u, ord, 145, MSG_PRODUCE);
break;
@ -1493,7 +1494,7 @@ name_cmd(unit * u, struct order * ord)
cmistake(u, ord, 148, MSG_PRODUCE);
break;
}
if (b->type == bt_find("generic")) {
if (b->type == bt_find("genericbuilding")) {
cmistake(u, ord, 278, MSG_EVENT);
break;
}
@ -1503,7 +1504,7 @@ name_cmd(unit * u, struct order * ord)
break;
}
}
if (b->type == bt_find("artsculpure")) {
if (b->type == bt_find("artsculpture")) {
cmistake(u, ord, 29, MSG_EVENT);
break;
}

1
src/common/kernel/building.c
View file

@ -34,6 +34,7 @@
#include <util/functions.h>
#include <util/language.h>
#include <util/lists.h>
#include <util/log.h>
#include <util/resolve.h>
#include <util/umlaut.h>

5
src/common/kernel/move.c
View file

@ -453,11 +453,6 @@ cansail(const region * r, ship * sh)
return false;
getshipweight(sh, &n, &p);
if( is_cursed(sh->attribs, C_SHIP_FLYING, 0) ) {
if (sh->type->cargo>500*100)
assert(!"Ein Schiff wurde verzaubert, das zu groß ist");
if (n > 10000) return false;
}
if (n > shipcapacity(sh)) return false;
if (p > sh->type->cabins) return false;

4
src/common/spells/spells.c
View file

@ -2270,6 +2270,10 @@ sp_stormwinds(castorder *co)
sh = pa->param[n]->data.sh;
if (sh->type->cargo>50000) {
ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order, "error_flying_ship_too_big", "ship", sh))
continue;
}
/* mit C_SHIP_NODRIFT haben wir kein Problem */
if (is_cursed(sh->attribs, C_SHIP_FLYING, 0) ) {
ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order, "error_spell_on_flying_ship", "ship", sh))

15
src/res/messages.xml
View file

@ -1430,6 +1430,14 @@
<text locale="en">"$unit($mage) calls $int($amount) undead from their graves."</text>
</message>
<message name="summonundead_effect_2" section="magic">
<type>
<arg name="mage" type="unit"/>
</type>
<text locale="de">"$unit($mage) stört die Ruhe der Toten."</text>
<text locale="en">"$unit($mage) communicates with the dead."</text>
</message>
<message name="viewreality_effect" section="magic">
<type>
<arg name="unit" type="unit"/>
@ -2432,13 +2440,6 @@
<text locale="de">"$unit($unit) in $region($region): '$order($command)' - $unit($unit) gelingt es zwar die Region zu verzaubern, aber irgendwas ging schief."</text>
<text locale="en">"$unit($unit) in $region($region): '$order($command)' - $unit($unit) manages to put a spell on the region, but something went wrong nonetheless."</text>
</message>
<message name="summonundead_effect_2" section="magic">
<type>
<arg name="unit" type="unit"/>
</type>
<text locale="de">"$unit($unit) stört die Ruhe der Toten."</text>
<text locale="en">"$unit($unit) communicates with the dead."</text>
</message>
<message name="regionmagic_effect" section="magic">
<type>
<arg name="unit" type="unit"/>