diff --git a/src/common/gamecode/randenc.c b/src/common/gamecode/randenc.c index b5b49dc2d..d4c5b233e 100644 --- a/src/common/gamecode/randenc.c +++ b/src/common/gamecode/randenc.c @@ -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) { diff --git a/src/common/modules/arena.c b/src/common/modules/arena.c index 2f393b655..4a4e16e15 100644 --- a/src/common/modules/arena.c +++ b/src/common/modules/arena.c @@ -14,6 +14,8 @@ #include #include + +#ifdef ARENA_MODULE #include "arena.h" /* modules include */ @@ -546,3 +548,4 @@ register_arena(void) tt_register(&tt_caldera); } +#endif /* def ARENA_MODULE */ diff --git a/src/common/modules/xmas2000.c b/src/common/modules/xmas2000.c index 9d88fe0fa..e293036f4 100644 --- a/src/common/modules/xmas2000.c +++ b/src/common/modules/xmas2000.c @@ -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) diff --git a/src/common/util/windir.h b/src/common/util/windir.h index b14972b12..856cb8c95 100644 --- a/src/common/util/windir.h +++ b/src/common/util/windir.h @@ -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); diff --git a/src/eressea.sln b/src/eressea.sln index 084637467..31750e181 100644 --- a/src/eressea.sln +++ b/src/eressea.sln @@ -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 diff --git a/src/res/de/strings.xml b/src/res/de/strings.xml index 0805e4c7c..547a655f0 100644 --- a/src/res/de/strings.xml +++ b/src/res/de/strings.xml @@ -1,3 +1,5 @@ + + _d: dativ (wir erklären allen /Trollen/ den Krieg) _p: plural (13 /Trolle/) @@ -5,7 +7,6 @@ _a: including article (ein Troll, a troll) - Tresen counter @@ -1917,9 +1918,6 @@ ALLIANZ ALLIANCE - - NACH - PFLANZEN @@ -2099,7 +2097,6 @@ Schaden - report newbie info Deine Partei hat letzte Runde keinen Zug @@ -3342,6 +3339,10 @@ Schleieraura Veil + + Segen der Erde + Blessed Harvest + Viehheilung Cattle Healing @@ -3668,10 +3669,6 @@ Schöne Träume Pleasant Dreams - - Segen der Erde - Blessed Harvest - Traumbilder entwirren Remove Dreams @@ -3910,8 +3907,7 @@ 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 @@ 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. With the help of this ritual the diff --git a/src/res/messages.xml b/src/res/messages.xml index 0bfcad22d..15a18059a 100644 --- a/src/res/messages.xml +++ b/src/res/messages.xml @@ -1854,7 +1854,6 @@ - "In $region($region) erschienen die Herren der Bäume." "In $region($region), the lords of the trees have risen." @@ -1863,7 +1862,6 @@ - "In $region($region) erhoben sich die Toten aus den Gräbern."