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

smaller message-fixes

This commit is contained in:
Enno Rehling 2003-08-03 21:38:17 +00:00
parent 1145f37975
commit f02d8abf9a
7 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1355,7 +1355,7 @@ randomevents(void)
* Lieber sammeln lassen, bis sie mindestens 5% der Bevölkerung sind, und
* dann erst auferstehen. */
int undead = unburied / (rand() % 2 + 1);
const race * rc;
const race * rc = NULL;
int i;
if (!undead || r->age < 20) continue;
@ -1395,7 +1395,7 @@ randomevents(void)
LOC(default_locale, rc_name(u->race, u->number!=1)), regionname(r, NULL));
{
message * msg = msg_message("undeadrise", "region amount", r, undead);
message * msg = msg_message("undeadrise", "region", r);
add_message(&r->msgs, msg);
for (u=r->units;u;u=u->next) freset(u->faction, FL_DH);
for (u=r->units;u;u=u->next) {
@ -1474,7 +1474,7 @@ randomevents(void)
log_printf("%d Ents in %s.\n", u->number, regionname(r, NULL));
msg = msg_message("entrise", "region amount", r, u->number);
msg = msg_message("entrise", "region", r);
add_message(&r->msgs, msg);
for (u=r->units;u;u=u->next) freset(u->faction, FL_DH);
for (u=r->units;u;u=u->next) {

3
src/common/modules/arena.c
View File

@ -14,6 +14,8 @@
#include <config.h>
#include <eressea.h>
#ifdef ARENA_MODULE
#include "arena.h"
/* modules include */
@ -546,3 +548,4 @@ register_arena(void)
tt_register(&tt_caldera);
}
#endif /* def ARENA_MODULE */

2
src/common/modules/xmas2000.c
View File

@ -1,7 +1,7 @@
/* vi: set ts=2:
*
*
* Eressea PB(E)M host Copyright (C) 1998-2000
* Eressea PB(E)M host Copyright (C) 1998-2003
* Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de)
* Henning Peters (faroul@beyond.kn-bremen.de)

2
src/common/util/windir.h
View File

@ -32,7 +32,7 @@ typedef struct dirent {
char d_dir[_MAX_DIR];
char d_ext[_MAX_EXT];
long hnd;
};
} dirent;
DIR *opendir(const char *name);
struct dirent *readdir(DIR * thedir);

32
src/eressea.sln
View File

@ -5,15 +5,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "attributes", "common\attrib
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eressea", "eressea\eressea.vcproj", "{B859D542-781E-4647-BCAB-3FE5ED077366}"
ProjectSection(ProjectDependencies) = postProject
{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211} = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4} = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
{79659D44-EC28-42B9-9475-6C0D62D0AAE0} = {79659D44-EC28-42B9-9475-6C0D62D0AAE0}
{330712B5-8B27-4B17-B3CF-7A02CC0F93C3} = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
{C14E3D2B-8189-4570-A4E3-9010C873E4FD} = {C14E3D2B-8189-4570-A4E3-9010C873E4FD}
{601CF164-F483-4DE7-8014-64BDD30680B5} = {601CF164-F483-4DE7-8014-64BDD30680B5}
{4C837BEC-A428-4287-84B3-8F8F9DE7FA00} = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
{0EE778AB-8445-40DB-8F65-6BE378A91B97} = {0EE778AB-8445-40DB-8F65-6BE378A91B97}
{79659D44-EC28-42B9-9475-6C0D62D0AAE0} = {79659D44-EC28-42B9-9475-6C0D62D0AAE0}
{EF495253-2EEC-4F83-B6C0-D651F88B2198} = {EF495253-2EEC-4F83-B6C0-D651F88B2198}
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4} = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
{601CF164-F483-4DE7-8014-64BDD30680B5} = {601CF164-F483-4DE7-8014-64BDD30680B5}
{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211} = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
{0EE778AB-8445-40DB-8F65-6BE378A91B97} = {0EE778AB-8445-40DB-8F65-6BE378A91B97}
{330712B5-8B27-4B17-B3CF-7A02CC0F93C3} = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
{4C837BEC-A428-4287-84B3-8F8F9DE7FA00} = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "common\gamecode\gamecode.vcproj", "{79659D44-EC28-42B9-9475-6C0D62D0AAE0}"
@ -30,14 +30,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "common\kernel\ker
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapper", "mapper\mapper.vcproj", "{17F83AAB-352D-4F68-ADA6-09F36D86826F}"
ProjectSection(ProjectDependencies) = postProject
{C14E3D2B-8189-4570-A4E3-9010C873E4FD} = {C14E3D2B-8189-4570-A4E3-9010C873E4FD}
{EF495253-2EEC-4F83-B6C0-D651F88B2198} = {EF495253-2EEC-4F83-B6C0-D651F88B2198}
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4} = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211} = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
{330712B5-8B27-4B17-B3CF-7A02CC0F93C3} = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
{C14E3D2B-8189-4570-A4E3-9010C873E4FD} = {C14E3D2B-8189-4570-A4E3-9010C873E4FD}
{601CF164-F483-4DE7-8014-64BDD30680B5} = {601CF164-F483-4DE7-8014-64BDD30680B5}
{4C837BEC-A428-4287-84B3-8F8F9DE7FA00} = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211} = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
{0EE778AB-8445-40DB-8F65-6BE378A91B97} = {0EE778AB-8445-40DB-8F65-6BE378A91B97}
{330712B5-8B27-4B17-B3CF-7A02CC0F93C3} = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
{4C837BEC-A428-4287-84B3-8F8F9DE7FA00} = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modules", "common\modules\modules.vcproj", "{601CF164-F483-4DE7-8014-64BDD30680B5}"
@ -60,6 +60,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "common\util\util.vc
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlsplitter", "D:\Documents\eressea\src\freeze\tools\xmlsplitter.vcproj", "{8031178A-081B-4BFA-AA98-46A2B03A3202}"
ProjectSection(ProjectDependencies) = postProject
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4} = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211} = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
@ -108,6 +114,10 @@ Global
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Debug.Build.0 = Debug|Win32
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Release.ActiveCfg = Release|Win32
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Release.Build.0 = Release|Win32
{8031178A-081B-4BFA-AA98-46A2B03A3202}.Debug.ActiveCfg = Debug|Win32
{8031178A-081B-4BFA-AA98-46A2B03A3202}.Debug.Build.0 = Debug|Win32
{8031178A-081B-4BFA-AA98-46A2B03A3202}.Release.ActiveCfg = Release|Win32
{8031178A-081B-4BFA-AA98-46A2B03A3202}.Release.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection

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

@ -1,3 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1" ?>
<strings xmlns="http://eressea.upb.de/~eressea/xsd/strings.xsd">
<comment>
_d: dativ (wir erklären allen /Trollen/ den Krieg)
_p: plural (13 /Trolle/)
@ -5,7 +7,6 @@
_a: including article (ein Troll, a troll)
</comment>
<strings>
<string name="Tresen">
<text locale="de">Tresen</text>
<text locale="en">counter </text>
@ -1917,9 +1918,6 @@
<text locale="de">ALLIANZ</text>
<text locale="en">ALLIANCE</text>
</string>
<string name="NACH">
<text locale="de">NACH</text>
</string>
<string name="PFLANZEN">
<text locale="de">PFLANZEN</text>
</string>
@ -2099,7 +2097,6 @@
<text locale="de">Schaden</text>
</string>
<comment>report newbie info</comment>
<string name="nr_nmr">
<text locale="de">Deine Partei hat letzte Runde keinen Zug
@ -3342,6 +3339,10 @@
<text locale="de">Schleieraura</text>
<text locale="en">Veil</text>
</string>
<string name="blessedharvest">
<text locale="de">Segen der Erde</text>
<text locale="en">Blessed Harvest</text>
</string>
<string name="gwyrrdearnsilver">
<text locale="de">Viehheilung</text>
<text locale="en">Cattle Healing</text>
@ -3668,10 +3669,6 @@
<text locale="de">Schöne Träume</text>
<text locale="en">Pleasant Dreams</text>
</string>
<string name="blessedharvest">
<text locale="de">Segen der Erde</text>
<text locale="en">Blessed Harvest</text>
</string>
<string name="illaundestroymagic">
<text locale="de">Traumbilder entwirren</text>
<text locale="en">Remove Dreams</text>
@ -3910,8 +3907,7 @@
</text>
<text locale="en">Combat medics are not the only ones
who can help those who got injured during a
battle. Druids are, with the help of a summons
of
battle. Druids are, with the help of a summons of
the Elemental Spirits Of Life, able to heal
wounds, mend broken bones or even regenerate
separated limbs as well.
@ -4784,9 +4780,8 @@
</string>
<string name="shapeshift">
<text locale="de">Mit Hilfe dieses arkanen Rituals
vermag
der Traumweber die wahre Gestalt einer Gruppe zu
verschleiern. Unbedarften Beobachtern erscheint
vermag der Traumweber die wahre Gestalt einer Gruppe
zu verschleiern. Unbedarften Beobachtern erscheint
sie dann als einer anderen Rasse zugehörig.
</text>
<text locale="en">With the help of this ritual the

2
src/res/messages.xml
View File

@ -1854,7 +1854,6 @@
<message name="entrise" section="events">
<type>
<arg name="region" type="region"></arg>
<arg name="amount" type="int"></arg>
</type>
<text locale="de">"In $region($region) erschienen die Herren der Bäume."</text>
<text locale="fr">"In $region($region), the lords of the trees have risen."</text>
@ -1863,7 +1862,6 @@
<message name="undeadrise" section="events">
<type>
<arg name="region" type="region"></arg>
<arg name="amount" type="int"></arg>
</type>
<text locale="de">"In $region($region) erhoben sich die Toten aus den Gräbern."</text>
</message>