diff --git a/src/common/attributes/attributes.vcproj b/src/common/attributes/attributes.vcproj index 7efdd3471..d9d557f15 100644 --- a/src/common/attributes/attributes.vcproj +++ b/src/common/attributes/attributes.vcproj @@ -43,7 +43,6 @@ Name="VCCustomBuildTool"/> @@ -169,6 +168,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/common/gamecode/gamecode.vcproj b/src/common/gamecode/gamecode.vcproj index e27db1cfd..8a8790048 100644 --- a/src/common/gamecode/gamecode.vcproj +++ b/src/common/gamecode/gamecode.vcproj @@ -169,6 +169,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/common/gamecode/xmlreport.c b/src/common/gamecode/xmlreport.c index 398bb8d5c..ec06b0e5d 100644 --- a/src/common/gamecode/xmlreport.c +++ b/src/common/gamecode/xmlreport.c @@ -67,7 +67,10 @@ /* libxml2 includes */ #include +#include +#ifdef USE_ICONV #include +#endif /* libc includes */ #include @@ -78,7 +81,9 @@ #define L10N(x) x +#ifdef USE_ICONV static iconv_t utf8; +#endif static xmlChar* xml_s(const char * str) @@ -88,7 +93,11 @@ xml_s(const char * str) char * outbuf = buffer; size_t inbytes = strlen(str)+1; size_t outbytes = sizeof(buffer); +#ifdef USE_ICONV iconv(utf8, (char**)&inbuf, &inbytes, (char**)&outbuf, &outbytes); +#else + isolat1ToUTF8(outbuf, &outbytes, inbuf, &inbytes); +#endif return (xmlChar*)buffer; } @@ -170,12 +179,16 @@ void xmlreport_init(void) { register_reporttype("xml", &report_xml, 1< @@ -166,6 +165,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/common/kernel/kernel.vcproj b/src/common/kernel/kernel.vcproj index 7695a8688..44bb07cf7 100644 --- a/src/common/kernel/kernel.vcproj +++ b/src/common/kernel/kernel.vcproj @@ -94,7 +94,6 @@ Name="VCCustomBuildTool"/> @@ -168,6 +167,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/common/kernel/pool.c b/src/common/kernel/pool.c index ab6852504..5d84b2920 100644 --- a/src/common/kernel/pool.c +++ b/src/common/kernel/pool.c @@ -82,7 +82,7 @@ get_resource(const unit * u, const resource_type * rtype) return get_spellpoints(u); if (rtype == oldresourcetype[R_PERMAURA]) return max_spellpoints(u->region, u); - assert(!"unbekannte ressource entdeckt"); + log_error(("trying to get unknown resource '%s'.\n", rtype->_name[0])); return 0; } diff --git a/src/common/kernel/save.c b/src/common/kernel/save.c index acdaa400e..c9053f285 100644 --- a/src/common/kernel/save.c +++ b/src/common/kernel/save.c @@ -1309,6 +1309,9 @@ readregion(FILE * F, short x, short y) if (strcmp(buf, "end")==0) break; res = calloc(sizeof(rawmaterial), 1); res->type = rmt_find(buf); + if (res->type==NULL) { + log_error(("invalid resourcetype %s in data.\n", buf)); + } assert(res->type!=NULL); res->level = ri(F); res->amount = ri(F); diff --git a/src/common/kernel/spell.c b/src/common/kernel/spell.c index a5386a2de..45c86a864 100644 --- a/src/common/kernel/spell.c +++ b/src/common/kernel/spell.c @@ -38,8 +38,8 @@ #include /* Bitte die Sprüche nach Gebieten und Stufe ordnen, denn in derselben - * Reihenfolge wie in Spelldaten tauchen sie auch im Report auf - */ + * Reihenfolge wie in Spelldaten tauchen sie auch im Report auf + */ spell_list * spells = NULL; diff --git a/src/common/kernel/xmlreader.c b/src/common/kernel/xmlreader.c index bf24e0892..8e010f0c2 100644 --- a/src/common/kernel/xmlreader.c +++ b/src/common/kernel/xmlreader.c @@ -37,7 +37,10 @@ without prior permission by the authors of Eressea. /* libxml includes */ #include #include +#include +#ifdef USE_ICONV #include +#endif /* libc includes */ #include @@ -81,12 +84,13 @@ xml_spell(xmlNode * node, const char * name) static const char * xml_to_locale(const xmlChar * xmlStr) { - static iconv_t context = (iconv_t)-1; static char zText[1024]; char * inbuf = (char*)xmlStr; char * outbuf = zText; size_t inbytes = strlen((const char*)xmlStr)+1; size_t outbytes = sizeof(zText); +#ifdef USE_ICONV + static iconv_t context = (iconv_t)-1; if (context==(iconv_t)-1) { context = iconv_open("", "UTF-8"); @@ -94,6 +98,12 @@ xml_to_locale(const xmlChar * xmlStr) assert(context!=(iconv_t)-1); iconv(context, &inbuf, &inbytes, &outbuf, &outbytes); +#else + size_t insize = inbytes; + if (UTF8Toisolat1(outbuf, &outbytes, inbuf, &inbytes)>=0) { + inbytes -= insize; + } +#endif if (inbytes!=0) { log_error(("string is too long: %d chars remain in %s.\n", inbytes, (const char*)xmlStr)); } diff --git a/src/common/kernel/xmlreader.h b/src/common/kernel/xmlreader.h index 37cfe842a..58fef6942 100644 --- a/src/common/kernel/xmlreader.h +++ b/src/common/kernel/xmlreader.h @@ -15,7 +15,6 @@ without prior permission by the authors of Eressea. #ifdef __cplusplus extern "C" { #endif -#include extern void register_xmlreader(void); extern void enable_xml_gamecode(void); #ifdef __cplusplus diff --git a/src/common/modules/modules.vcproj b/src/common/modules/modules.vcproj index 2c63b61b9..a3019e6d9 100644 --- a/src/common/modules/modules.vcproj +++ b/src/common/modules/modules.vcproj @@ -42,7 +42,6 @@ Name="VCCustomBuildTool"/> @@ -166,6 +165,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/common/races/races.vcproj b/src/common/races/races.vcproj index b9c1046d3..eaf82199b 100644 --- a/src/common/races/races.vcproj +++ b/src/common/races/races.vcproj @@ -42,7 +42,6 @@ Name="VCCustomBuildTool"/> @@ -166,6 +165,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/common/spells/spells.vcproj b/src/common/spells/spells.vcproj index 8f6af22ba..aa0109341 100644 --- a/src/common/spells/spells.vcproj +++ b/src/common/spells/spells.vcproj @@ -93,7 +93,6 @@ Name="VCCustomBuildTool"/> @@ -166,6 +165,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/common/triggers/triggers.vcproj b/src/common/triggers/triggers.vcproj index 83ec07158..fe6a49981 100644 --- a/src/common/triggers/triggers.vcproj +++ b/src/common/triggers/triggers.vcproj @@ -3,6 +3,7 @@ ProjectType="Visual C++" Version="7.10" Name="triggers" + RootNamespace="triggers" SccProjectName="" SccLocalPath=""> @@ -42,7 +43,6 @@ Name="VCCustomBuildTool"/> @@ -166,6 +166,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/common/util/attrib.c b/src/common/util/attrib.c index 261c0e428..5c57c72fe 100644 --- a/src/common/util/attrib.c +++ b/src/common/util/attrib.c @@ -183,7 +183,7 @@ a_new(const attrib_type * at) { int a_readdefault(attrib * a, FILE * f) { - assert(sizeof(int)==sizeof(a->data)); +/* assert(sizeof(int)==sizeof(a->data)); */ fscanf(f, "%d", &a->data.i); return AT_READ_OK; } diff --git a/src/common/util/util.vcproj b/src/common/util/util.vcproj index 4a0f14335..03310bb49 100644 --- a/src/common/util/util.vcproj +++ b/src/common/util/util.vcproj @@ -146,7 +146,106 @@ Name="VCCustomBuildTool"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/config.h b/src/config.h index 3dd02153f..b5992c3ac 100644 --- a/src/config.h +++ b/src/config.h @@ -138,7 +138,6 @@ typedef struct stat stat_type; #ifdef _MSC_VER # define R_OK 4 # define HAVE__MKDIR_WITHOUT_PERMISSION - # define HAVE_INLINE # define INLINE_FUNCTION __inline diff --git a/src/eressea.sln b/src/eressea.sln index 1b2548def..4a0b6e6ab 100644 --- a/src/eressea.sln +++ b/src/eressea.sln @@ -76,80 +76,129 @@ EndProject Global GlobalSection(SolutionConfiguration) = preSolution Debug = Debug + Debug64 = Debug64 Profile = Profile Release = Release + Release64 = Release64 EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Debug.ActiveCfg = Debug|Win32 {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Debug.Build.0 = Debug|Win32 + {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Debug64.ActiveCfg = Debug64|Win32 + {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Debug64.Build.0 = Debug64|Win32 {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Profile.ActiveCfg = Profile|Win32 {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Profile.Build.0 = Profile|Win32 {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Release.ActiveCfg = Release|Win32 {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Release.Build.0 = Release|Win32 + {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Release64.ActiveCfg = Release64|Win32 + {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Release64.Build.0 = Release64|Win32 {B859D542-781E-4647-BCAB-3FE5ED077366}.Debug.ActiveCfg = Debug|Win32 {B859D542-781E-4647-BCAB-3FE5ED077366}.Debug.Build.0 = Debug|Win32 + {B859D542-781E-4647-BCAB-3FE5ED077366}.Debug64.ActiveCfg = Debug64|Win32 + {B859D542-781E-4647-BCAB-3FE5ED077366}.Debug64.Build.0 = Debug64|Win32 {B859D542-781E-4647-BCAB-3FE5ED077366}.Profile.ActiveCfg = Profile|Win32 {B859D542-781E-4647-BCAB-3FE5ED077366}.Profile.Build.0 = Profile|Win32 {B859D542-781E-4647-BCAB-3FE5ED077366}.Release.ActiveCfg = Release|Win32 {B859D542-781E-4647-BCAB-3FE5ED077366}.Release.Build.0 = Release|Win32 + {B859D542-781E-4647-BCAB-3FE5ED077366}.Release64.ActiveCfg = Release64|Win32 + {B859D542-781E-4647-BCAB-3FE5ED077366}.Release64.Build.0 = Release64|Win32 {79659D44-EC28-42B9-9475-6C0D62D0AAE0}.Debug.ActiveCfg = Debug|Win32 {79659D44-EC28-42B9-9475-6C0D62D0AAE0}.Debug.Build.0 = Debug|Win32 + {79659D44-EC28-42B9-9475-6C0D62D0AAE0}.Debug64.ActiveCfg = Debug64|Win32 + {79659D44-EC28-42B9-9475-6C0D62D0AAE0}.Debug64.Build.0 = Debug64|Win32 {79659D44-EC28-42B9-9475-6C0D62D0AAE0}.Profile.ActiveCfg = Profile|Win32 {79659D44-EC28-42B9-9475-6C0D62D0AAE0}.Profile.Build.0 = Profile|Win32 {79659D44-EC28-42B9-9475-6C0D62D0AAE0}.Release.ActiveCfg = Release|Win32 {79659D44-EC28-42B9-9475-6C0D62D0AAE0}.Release.Build.0 = Release|Win32 + {79659D44-EC28-42B9-9475-6C0D62D0AAE0}.Release64.ActiveCfg = Release64|Win32 + {79659D44-EC28-42B9-9475-6C0D62D0AAE0}.Release64.Build.0 = Release64|Win32 {C14E3D2B-8189-4570-A4E3-9010C873E4FD}.Debug.ActiveCfg = Debug|Win32 {C14E3D2B-8189-4570-A4E3-9010C873E4FD}.Debug.Build.0 = Debug|Win32 + {C14E3D2B-8189-4570-A4E3-9010C873E4FD}.Debug64.ActiveCfg = Debug64|Win32 + {C14E3D2B-8189-4570-A4E3-9010C873E4FD}.Debug64.Build.0 = Debug64|Win32 {C14E3D2B-8189-4570-A4E3-9010C873E4FD}.Profile.ActiveCfg = Profile|Win32 {C14E3D2B-8189-4570-A4E3-9010C873E4FD}.Profile.Build.0 = Profile|Win32 {C14E3D2B-8189-4570-A4E3-9010C873E4FD}.Release.ActiveCfg = Release|Win32 {C14E3D2B-8189-4570-A4E3-9010C873E4FD}.Release.Build.0 = Release|Win32 + {C14E3D2B-8189-4570-A4E3-9010C873E4FD}.Release64.ActiveCfg = Release64|Win32 + {C14E3D2B-8189-4570-A4E3-9010C873E4FD}.Release64.Build.0 = Release64|Win32 {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}.Debug.ActiveCfg = Debug|Win32 {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}.Debug.Build.0 = Debug|Win32 + {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}.Debug64.ActiveCfg = Debug64|Win32 + {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}.Debug64.Build.0 = Debug64|Win32 {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}.Profile.ActiveCfg = Profile|Win32 {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}.Profile.Build.0 = Profile|Win32 {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}.Release.ActiveCfg = Release|Win32 {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}.Release.Build.0 = Release|Win32 + {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}.Release64.ActiveCfg = Release64|Win32 + {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}.Release64.Build.0 = Release64|Win32 {17F83AAB-352D-4F68-ADA6-09F36D86826F}.Debug.ActiveCfg = Debug|Win32 {17F83AAB-352D-4F68-ADA6-09F36D86826F}.Debug.Build.0 = Debug|Win32 + {17F83AAB-352D-4F68-ADA6-09F36D86826F}.Debug64.ActiveCfg = Debug64|Win32 + {17F83AAB-352D-4F68-ADA6-09F36D86826F}.Debug64.Build.0 = Debug64|Win32 {17F83AAB-352D-4F68-ADA6-09F36D86826F}.Profile.ActiveCfg = Profile|Win32 {17F83AAB-352D-4F68-ADA6-09F36D86826F}.Release.ActiveCfg = Release|Win32 + {17F83AAB-352D-4F68-ADA6-09F36D86826F}.Release64.ActiveCfg = Release64|Win32 {601CF164-F483-4DE7-8014-64BDD30680B5}.Debug.ActiveCfg = Debug|Win32 {601CF164-F483-4DE7-8014-64BDD30680B5}.Debug.Build.0 = Debug|Win32 + {601CF164-F483-4DE7-8014-64BDD30680B5}.Debug64.ActiveCfg = Debug64|Win32 + {601CF164-F483-4DE7-8014-64BDD30680B5}.Debug64.Build.0 = Debug64|Win32 {601CF164-F483-4DE7-8014-64BDD30680B5}.Profile.ActiveCfg = Profile|Win32 {601CF164-F483-4DE7-8014-64BDD30680B5}.Profile.Build.0 = Profile|Win32 {601CF164-F483-4DE7-8014-64BDD30680B5}.Release.ActiveCfg = Release|Win32 {601CF164-F483-4DE7-8014-64BDD30680B5}.Release.Build.0 = Release|Win32 + {601CF164-F483-4DE7-8014-64BDD30680B5}.Release64.ActiveCfg = Release64|Win32 + {601CF164-F483-4DE7-8014-64BDD30680B5}.Release64.Build.0 = Release64|Win32 {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}.Debug.ActiveCfg = Debug|Win32 {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}.Debug.Build.0 = Debug|Win32 + {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}.Debug64.ActiveCfg = Debug64|Win32 + {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}.Debug64.Build.0 = Debug64|Win32 {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}.Profile.ActiveCfg = Profile|Win32 {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}.Profile.Build.0 = Profile|Win32 {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}.Release.ActiveCfg = Release|Win32 {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}.Release.Build.0 = Release|Win32 + {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}.Release64.ActiveCfg = Release64|Win32 + {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}.Release64.Build.0 = Release64|Win32 {0EE778AB-8445-40DB-8F65-6BE378A91B97}.Debug.ActiveCfg = Debug|Win32 {0EE778AB-8445-40DB-8F65-6BE378A91B97}.Debug.Build.0 = Debug|Win32 + {0EE778AB-8445-40DB-8F65-6BE378A91B97}.Debug64.ActiveCfg = Debug64|Win32 + {0EE778AB-8445-40DB-8F65-6BE378A91B97}.Debug64.Build.0 = Debug64|Win32 {0EE778AB-8445-40DB-8F65-6BE378A91B97}.Profile.ActiveCfg = Profile|Win32 {0EE778AB-8445-40DB-8F65-6BE378A91B97}.Profile.Build.0 = Profile|Win32 {0EE778AB-8445-40DB-8F65-6BE378A91B97}.Release.ActiveCfg = Release|Win32 {0EE778AB-8445-40DB-8F65-6BE378A91B97}.Release.Build.0 = Release|Win32 + {0EE778AB-8445-40DB-8F65-6BE378A91B97}.Release64.ActiveCfg = Release64|Win32 + {0EE778AB-8445-40DB-8F65-6BE378A91B97}.Release64.Build.0 = Release64|Win32 {EF495253-2EEC-4F83-B6C0-D651F88B2198}.Debug.ActiveCfg = Debug|Win32 {EF495253-2EEC-4F83-B6C0-D651F88B2198}.Debug.Build.0 = Debug|Win32 + {EF495253-2EEC-4F83-B6C0-D651F88B2198}.Debug64.ActiveCfg = Debug64|Win32 + {EF495253-2EEC-4F83-B6C0-D651F88B2198}.Debug64.Build.0 = Debug64|Win32 {EF495253-2EEC-4F83-B6C0-D651F88B2198}.Profile.ActiveCfg = Profile|Win32 {EF495253-2EEC-4F83-B6C0-D651F88B2198}.Profile.Build.0 = Profile|Win32 {EF495253-2EEC-4F83-B6C0-D651F88B2198}.Release.ActiveCfg = Release|Win32 {EF495253-2EEC-4F83-B6C0-D651F88B2198}.Release.Build.0 = Release|Win32 + {EF495253-2EEC-4F83-B6C0-D651F88B2198}.Release64.ActiveCfg = Release64|Win32 + {EF495253-2EEC-4F83-B6C0-D651F88B2198}.Release64.Build.0 = Release64|Win32 {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Debug.ActiveCfg = Debug|Win32 {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Debug.Build.0 = Debug|Win32 + {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Debug64.ActiveCfg = Debug64|Win32 + {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Debug64.Build.0 = Debug64|Win32 {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Profile.ActiveCfg = Profile|Win32 {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Profile.Build.0 = Profile|Win32 {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Release.ActiveCfg = Release|Win32 {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Release.Build.0 = Release|Win32 + {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Release64.ActiveCfg = Release64|Win32 + {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Release64.Build.0 = Release64|Win32 {749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}.Debug.ActiveCfg = Debug|Win32 {749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}.Debug.Build.0 = Debug|Win32 + {749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}.Debug64.ActiveCfg = Debug64|Win32 + {749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}.Debug64.Build.0 = Debug64|Win32 {749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}.Profile.ActiveCfg = Profile|Win32 {749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}.Profile.Build.0 = Profile|Win32 {749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}.Release.ActiveCfg = Release|Win32 {749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}.Release.Build.0 = Release|Win32 + {749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}.Release64.ActiveCfg = Release64|Win32 + {749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}.Release64.Build.0 = Release64|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/src/eressea/eressea-lua.vcproj b/src/eressea/eressea-lua.vcproj index 337b361cc..029661a61 100644 --- a/src/eressea/eressea-lua.vcproj +++ b/src/eressea/eressea-lua.vcproj @@ -207,6 +207,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -250,6 +375,18 @@ Name="VCCLCompilerTool" DisableLanguageExtensions="FALSE"/> + + + + + + @@ -277,6 +414,18 @@ Name="VCCLCompilerTool" DisableLanguageExtensions="FALSE"/> + + + + + + @@ -313,6 +462,18 @@ Name="VCCLCompilerTool" DisableLanguageExtensions="FALSE"/> + + + + + + @@ -340,6 +501,18 @@ Name="VCCLCompilerTool" DisableLanguageExtensions="FALSE"/> + + + + + + @@ -364,6 +537,18 @@ Name="VCCLCompilerTool" DisableLanguageExtensions="FALSE"/> + + + + + + + + + + + + @@ -404,6 +601,12 @@ Name="VCCLCompilerTool" DisableLanguageExtensions="FALSE"/> + + + diff --git a/src/eressea/eressea.vcproj b/src/eressea/eressea.vcproj index c29e9f078..b4b3957f7 100644 --- a/src/eressea/eressea.vcproj +++ b/src/eressea/eressea.vcproj @@ -4,6 +4,7 @@ Version="7.10" Name="eressea" ProjectGUID="{749A2F7C-B9C3-4CEB-B1B2-1D4587E68718}" + RootNamespace="eressea" SccProjectName="" SccLocalPath=""> @@ -202,6 +203,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -239,6 +362,18 @@ Name="VCCLCompilerTool" DisableLanguageExtensions="TRUE"/> + + + + + + diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c index 16ba1cfdc..23931662f 100644 --- a/src/eressea/korrektur.c +++ b/src/eressea/korrektur.c @@ -255,20 +255,6 @@ no_teurefremde(boolean convert) } } -attrib_type at_roadfix = { - "roadfix", - DEFAULT_INIT, - DEFAULT_FINALIZE, - DEFAULT_AGE, -#if RELEASE_VERSION #include #include -#include #include +#include +#include /* kernel includes */ #include @@ -147,25 +148,28 @@ struct settings global = { static void game_init(void) { - init_triggers(); - init_xmas(); - report_init(); - creport_init(); + init_triggers(); + init_xmas(); - debug_language("locales.log"); - register_races(); - register_resources(); - register_buildings(); - register_ships(); + reports_init(); + report_init(); + creport_init(); + xmlreport_init(); + + debug_language("locales.log"); + register_races(); + register_resources(); + register_buildings(); + register_ships(); register_itemfunctions(); - register_spells(); + register_spells(); #ifdef DUNGEON_MODULE - register_dungeon(); + register_dungeon(); #endif + register_itemtypes(); register_xmlreader(); enable_xml_gamecode(); - init_spells(); init_data(xmlfile); init_locales(); @@ -173,33 +177,31 @@ game_init(void) init_races(); init_itemtypes(); init_races(); - init_economy(); -#if NEW_RESOURCEGROWTH - init_rawmaterials(); -#endif + init_economy(); + init_rawmaterials(); - init_gmcmd(); + init_gmcmd(); #ifdef INFOCMD_MODULE - init_info(); + init_info(); #endif #ifdef MUSEUM_MODULE - register_museum(); + register_museum(); #endif #ifdef ARENA_MODULE - register_arena(); + register_arena(); #endif #ifdef WORMHOLE_MODULE register_wormholes(); #endif #ifdef REMOVE_THIS - render_init(); - { - FILE * F = fopen("messagetypes.txt", "w"); - debug_messagetypes(F); - fclose(F); - abort(); - } + render_init(); + { + FILE * F = fopen("messagetypes.txt", "w"); + debug_messagetypes(F); + fclose(F); + abort(); + } #endif } diff --git a/src/eressea/server.cpp b/src/eressea/server.cpp index e823b55b4..1fd44349d 100644 --- a/src/eressea/server.cpp +++ b/src/eressea/server.cpp @@ -54,12 +54,12 @@ #endif /* gamecode includes */ -#include -#include -#include #include #include #include +#include +#include +#include /* kernel includes */ #include @@ -236,6 +236,7 @@ game_init(void) register_itemtypes(); register_xmlreader(); enable_xml_gamecode(); + init_data(xmlfile); init_locales(); diff --git a/src/mapper/mapper.vcproj b/src/mapper/mapper.vcproj index 5f7343f44..85234570f 100644 --- a/src/mapper/mapper.vcproj +++ b/src/mapper/mapper.vcproj @@ -200,6 +200,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +