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

* dynamictypes raus aus dem code, rein in res/ 

* bugfix regatta-vergrößerung
This commit is contained in:
Enno Rehling 2002-03-24 10:22:27 +00:00
parent 5a31694246
commit 5d770917ef
6 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -814,7 +814,7 @@ readgame(boolean backup)
} }
#endif #endif
turn = ri(F); turn = ri(F);
read_dynamictypes(); /* read_dynamictypes(); */
if (global.data_version < NEWMAGIC) { if (global.data_version < NEWMAGIC) {
max_unique_id = 0; max_unique_id = 0;
} else { } else {
@ -1260,7 +1260,7 @@ writegame(char *path, char quiet)
sprintf(buf, "%s/%d.players", datapath(), turn); sprintf(buf, "%s/%d.players", datapath(), turn);
export_players(playerfile); export_players(playerfile);
#endif #endif
write_dynamictypes(); /* write_dynamictypes(); */
F = cfopen(path, "w"); F = cfopen(path, "w");
if (F==NULL) if (F==NULL)

3
src/common/util/attrib.c
View File

@ -252,13 +252,12 @@ a_read(FILE * f, attrib ** attribs)
while(key!=-1) { while(key!=-1) {
attrib_type * at = at_find(key); attrib_type * at = at_find(key);
attrib * na;
if (!at) { if (!at) {
fprintf(stderr, "attribute hash: %d (%s)\n", key, zText); fprintf(stderr, "attribute hash: %d (%s)\n", key, zText);
assert(at || !"attribute not registered"); assert(at || !"attribute not registered");
} }
if (at->read) { if (at->read) {
na = a_new(at); attrib * na = a_new(at);
if (at->read(na, f)) if (at->read(na, f))
a_add(attribs, na); a_add(attribs, na);
else else

2
src/eressea/korrektur.c
View File

@ -1788,7 +1788,7 @@ resize_plane(struct plane * p, int radius)
for (y=miny;y<=maxy;++y) { for (y=miny;y<=maxy;++y) {
region * r = findregion(x, y); region * r = findregion(x, y);
if (r==NULL) { if (r==NULL) {
r = new_region(minx+x, miny+y); r = new_region(x, y);
freset(r, RF_ENCOUNTER); freset(r, RF_ENCOUNTER);
r->planep = p; r->planep = p;
if (distance(r, center)==radius) { if (distance(r, center)==radius) {

6
src/res/de/strings.xml
View File

@ -522,12 +522,6 @@
<string name="wand_p"> <string name="wand_p">
<text locale="de">Zauberstäbe</text> <text locale="de">Zauberstäbe</text>
</string> </string>
<string name="wand_of_tears">
<text locale="de">Szepter der Tränen</text>
</string>
<string name="wand_of_tears_p">
<text locale="de">Szepter der Tränen</text>
</string>
<comment>Burgausbaustufen</comment> <comment>Burgausbaustufen</comment>
<string name="site"> <string name="site">

6
src/res/en/strings.xml
View File

@ -1917,12 +1917,6 @@
<string name="wand_p"> <string name="wand_p">
<text locale="en">wands</text> <text locale="en">wands</text>
</string> </string>
<string name="wand_of_tears">
<text locale="en">wand of tears</text>
</string>
<string name="wand_of_tears_p">
<text locale="en">wands of tears</text>
</string>
<comment> Küsten</comment> <comment> Küsten</comment>
<string name="Nordwestküste"> <string name="Nordwestküste">

14
src/res/resources.xml
View File

@ -15,6 +15,20 @@
</string> </string>
</strings> </strings>
<resource name="wand_of_tears">
<item notlost weight="1" capacity="0">
<function name="use" value="use_wand_of_tears"></function>
</item>
</resource>
<string name="wand_of_tears">
<text locale="de">Szepter der Tränen</text>
<text locale="en">wand of tears</text>
</string>
<string name="wand_of_tears_p">
<text locale="de">Szepter der Tränen</text>
<text locale="en">wands of tears</text>
</string>
<resource name="magicbox"> <resource name="magicbox">
<comment>A magic box that increases the user's capacity by 10 WU</comment> <comment>A magic box that increases the user's capacity by 10 WU</comment>
<item cursed weight="0" capacity="1000"> <item cursed weight="0" capacity="1000">