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

bug, kampfmeldung englisch 

bug, crash bei ZEIGE
This commit is contained in:
Enno Rehling 2003-05-28 16:24:28 +00:00
parent c7c7c3ac96
commit a45f59168b
4 changed files with 43 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/gamecode/report.c
View File

@ -2126,9 +2126,9 @@ report(FILE *F, faction * f, const faction_list * addresses,
for (a=a_find(f->attribs, &at_showitem);a;a=a->nexttype) {
const potion_type * ptype = resource2potion(((const item_type*)a->data.v)->rtype);
const char * description = NULL;
const char * pname = resourcename(ptype->itype->rtype, 0);
requirement * m;
if (ptype==NULL) continue;
if (ptype!=NULL) {
const char * pname = resourcename(ptype->itype->rtype, 0);
m = ptype->itype->construction->materials;
if (ch==0) {
rnl(F);
@ -2152,6 +2152,7 @@ report(FILE *F, faction * f, const faction_list * addresses,
description = LOC(f->locale, mkname("potion", pname));
if (description==pname) description = ptype->text;
centre(F, description, true);
}
}
rnl(F);
centre(F, LOC(f->locale, "nr_alliances"), false);

2
src/common/spells/regioncurse.c
View File

@ -343,7 +343,7 @@ static struct curse_type ct_badmagicresistancezone = {
static struct curse_type ct_goodmagicresistancezone = {
"goodmagicresistancezone",
CURSETYP_NORM, 0, NO_MERGE,
"Dieser Lied, das irgendwie in die magische Essenz der Region gewoben "
"Dieses Lied, das irgendwie in die magische Essenz der Region gewoben "
"ist, verstärkt die natürliche Widerstandskraft gegen eine "
"Verzauberung. Es scheint jedoch nur auf bestimmte Einheiten zu wirken.",
cinfo_region

47
src/eressea.sln
View File

@ -21,40 +21,29 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "triggers", "common\triggers
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "common\util\util.vcproj", "{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlsplitter", "tools\xmlsplitter.vcproj", "{8031178A-081B-4BFA-AA98-46A2B03A3202}"
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
ConfigName.0 = Debug
ConfigName.1 = Release
EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
{B859D542-781E-4647-BCAB-3FE5ED077366}.0 = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
{B859D542-781E-4647-BCAB-3FE5ED077366}.1 = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
{B859D542-781E-4647-BCAB-3FE5ED077366}.2 = {79659D44-EC28-42B9-9475-6C0D62D0AAE0}
{B859D542-781E-4647-BCAB-3FE5ED077366}.3 = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
{B859D542-781E-4647-BCAB-3FE5ED077366}.0 = {EF495253-2EEC-4F83-B6C0-D651F88B2198}
{B859D542-781E-4647-BCAB-3FE5ED077366}.1 = {0EE778AB-8445-40DB-8F65-6BE378A91B97}
{B859D542-781E-4647-BCAB-3FE5ED077366}.2 = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
{B859D542-781E-4647-BCAB-3FE5ED077366}.3 = {601CF164-F483-4DE7-8014-64BDD30680B5}
{B859D542-781E-4647-BCAB-3FE5ED077366}.4 = {C14E3D2B-8189-4570-A4E3-9010C873E4FD}
{B859D542-781E-4647-BCAB-3FE5ED077366}.5 = {601CF164-F483-4DE7-8014-64BDD30680B5}
{B859D542-781E-4647-BCAB-3FE5ED077366}.6 = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
{B859D542-781E-4647-BCAB-3FE5ED077366}.7 = {0EE778AB-8445-40DB-8F65-6BE378A91B97}
{B859D542-781E-4647-BCAB-3FE5ED077366}.8 = {EF495253-2EEC-4F83-B6C0-D651F88B2198}
{17F83AAB-352D-4F68-ADA6-09F36D86826F}.0 = {EF495253-2EEC-4F83-B6C0-D651F88B2198}
{17F83AAB-352D-4F68-ADA6-09F36D86826F}.1 = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
{17F83AAB-352D-4F68-ADA6-09F36D86826F}.2 = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
{17F83AAB-352D-4F68-ADA6-09F36D86826F}.3 = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
{17F83AAB-352D-4F68-ADA6-09F36D86826F}.4 = {C14E3D2B-8189-4570-A4E3-9010C873E4FD}
{17F83AAB-352D-4F68-ADA6-09F36D86826F}.5 = {601CF164-F483-4DE7-8014-64BDD30680B5}
{17F83AAB-352D-4F68-ADA6-09F36D86826F}.6 = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
{17F83AAB-352D-4F68-ADA6-09F36D86826F}.7 = {0EE778AB-8445-40DB-8F65-6BE378A91B97}
{8031178A-081B-4BFA-AA98-46A2B03A3202}.0 = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
{8031178A-081B-4BFA-AA98-46A2B03A3202}.1 = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
{8031178A-081B-4BFA-AA98-46A2B03A3202}.2 = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
{8031178A-081B-4BFA-AA98-46A2B03A3202}.3 = {79659D44-EC28-42B9-9475-6C0D62D0AAE0}
{8031178A-081B-4BFA-AA98-46A2B03A3202}.4 = {C14E3D2B-8189-4570-A4E3-9010C873E4FD}
{8031178A-081B-4BFA-AA98-46A2B03A3202}.5 = {0EE778AB-8445-40DB-8F65-6BE378A91B97}
{8031178A-081B-4BFA-AA98-46A2B03A3202}.6 = {EF495253-2EEC-4F83-B6C0-D651F88B2198}
{8031178A-081B-4BFA-AA98-46A2B03A3202}.7 = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
{8031178A-081B-4BFA-AA98-46A2B03A3202}.8 = {601CF164-F483-4DE7-8014-64BDD30680B5}
{B859D542-781E-4647-BCAB-3FE5ED077366}.5 = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
{B859D542-781E-4647-BCAB-3FE5ED077366}.6 = {79659D44-EC28-42B9-9475-6C0D62D0AAE0}
{B859D542-781E-4647-BCAB-3FE5ED077366}.7 = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
{B859D542-781E-4647-BCAB-3FE5ED077366}.8 = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
{17F83AAB-352D-4F68-ADA6-09F36D86826F}.0 = {0EE778AB-8445-40DB-8F65-6BE378A91B97}
{17F83AAB-352D-4F68-ADA6-09F36D86826F}.1 = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
{17F83AAB-352D-4F68-ADA6-09F36D86826F}.2 = {601CF164-F483-4DE7-8014-64BDD30680B5}
{17F83AAB-352D-4F68-ADA6-09F36D86826F}.3 = {C14E3D2B-8189-4570-A4E3-9010C873E4FD}
{17F83AAB-352D-4F68-ADA6-09F36D86826F}.4 = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
{17F83AAB-352D-4F68-ADA6-09F36D86826F}.5 = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
{17F83AAB-352D-4F68-ADA6-09F36D86826F}.6 = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
{17F83AAB-352D-4F68-ADA6-09F36D86826F}.7 = {EF495253-2EEC-4F83-B6C0-D651F88B2198}
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Debug.ActiveCfg = Debug|Win32
@ -99,10 +88,6 @@ 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

3
src/res/messages.xml
View File

@ -672,8 +672,7 @@
<arg name="runto" type="region"></arg>
</type>
<text locale="de">"$unit($unit) verlor $int($fallen) Personen$if($alive,", $int($alive) überlebten","")$if($run," und $int($run) flohen$if($isnull($runto),""," nach $region($runto)")","")."</text>
<text locale="fr">"$unit($unit) lost $int($fallen) people: $int($alive) survived$if($run," and $int($run) fled$if($isnull($runto),""," to $region($runto)"),"")."</text>
<text locale="en">"$unit($unit) lost $int($fallen) people: $int($alive) survived$if($run," and $int($run) fled$if($isnull($runto),""," to $region($runto)"),"")."</text>
<text locale="en">"$unit($unit) lost $int($fallen) people: $if($alive,", $int($alive) survived","")$if($run," and $int($run) fled$if($isnull($runto),""," to $region($runto)")","")."</text>
</message>
<message name="killsandhits" section="battle">
<type>