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

small fixes

This commit is contained in:
Enno Rehling 2006-10-29 14:03:56 +00:00
parent 4f182eb06b
commit 974747b4ad
3 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/kernel/item.h
View File

@ -26,9 +26,9 @@ struct locale;
struct troop; struct troop;
typedef struct item { typedef struct item {
struct item * next;
const struct item_type * type; const struct item_type * type;
int number; int number;
struct item * next;
} item; } item;
typedef struct resource { typedef struct resource {

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

@ -1073,7 +1073,6 @@ readunit(FILE * F)
} }
set_order(&u->thisorder, NULL); set_order(&u->thisorder, NULL);
assert(u->number <= UNIT_MAXSIZE);
assert(u->race); assert(u->race);
if (global.data_version<NEWSKILL_VERSION) { if (global.data_version<NEWSKILL_VERSION) {
/* convert old data */ /* convert old data */
@ -1190,7 +1189,6 @@ writeunit(FILE * F, const unit * u)
wnl(F); wnl(F);
#endif #endif
assert(u->number <= UNIT_MAXSIZE);
assert(u->race); assert(u->race);
for (i=0;i!=u->skill_size;++i) { for (i=0;i!=u->skill_size;++i) {

1
src/res/messages.xml
View File

@ -5524,6 +5524,7 @@
<arg name="unit" type="unit"/> <arg name="unit" type="unit"/>
<arg name="region" type="region"/> <arg name="region" type="region"/>
<arg name="command" type="order"/> <arg name="command" type="order"/>
<arg name="maxsize" type="int"/>
</type> </type>
<text locale="de">"$unit($unit) in $region($region): '$order($command)' - Einheiten dürfen nicht mehr als $int($maxsize) Personen enthalten."</text> <text locale="de">"$unit($unit) in $region($region): '$order($command)' - Einheiten dürfen nicht mehr als $int($maxsize) Personen enthalten."</text>
<text locale="fr">"$unit($unit) in $region($region): '$order($command)' - Units may not have more than $int($maxsize) members."</text> <text locale="fr">"$unit($unit) in $region($region): '$order($command)' - Units may not have more than $int($maxsize) members."</text>