josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix windows-build and change some warnings if configuration-files can not be read properly

Browse Source 
- Add proper warning about missing [authserver] -tag in authserver configuration file if not found.
- Add proper warning about missing [worldserver] -tag in worldserver configuration file if not found.
Thanks to Qaston for finding the redefininition of strdup!

--HG--
branch : trunk
This commit is contained in:
click
2010-07-29 09:00:55 +02:00
parent 09728dd491
commit 969bf213b8
4 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/authserver/Main.cpp
+2 -1
View File
@@ -165,7 +165,8 @@ extern int main(int argc, char **argv)
if (!sConfig.SetSource(cfg_file)) if (!sConfig.SetSource(cfg_file))
{ {
sLog.outError("Could not find configuration file %s.", cfg_file); sLog.outError("\x1b[31mInvalid or missing configuration file :\x1b[0m %s", cfg_file);
sLog.outError("\x1b[31mVerify that the file exists and has \'\x1b[0m[authserver]\x1b[31m\' written in the top of the file!\x1b[0m");
return 1; return 1;
} }
sLog.Initialize(); sLog.Initialize();
src/server/shared/Common.h
-1
View File
@@ -134,7 +134,6 @@
#define snprintf _snprintf #define snprintf _snprintf
#define atoll __atoi64 #define atoll __atoi64
#define vsnprintf _vsnprintf #define vsnprintf _vsnprintf
#define strdup _strdup
#define finite(X) _finite(X) #define finite(X) _finite(X)
#else #else
src/server/worldserver/Main.cpp
+2 -1
View File
@@ -133,7 +133,8 @@ extern int main(int argc, char **argv)
if (!sConfig.SetSource(cfg_file)) if (!sConfig.SetSource(cfg_file))
{ {
sLog.outError("Could not find configuration file %s.", cfg_file); sLog.outError("\x1b[31mInvalid or missing configuration file :\x1b[0m %s", cfg_file);
sLog.outError("\x1b[31mVerify that the file exists and has \'\x1b[0m[worldserver]\x1b[31m\' written in the top of the file!\x1b[0m");
return 1; return 1;
} }
sLog.outString("Using configuration file %s.", cfg_file); sLog.outString("Using configuration file %s.", cfg_file);
win/VC90/shared.vcproj
-24
View File
@@ -364,30 +364,6 @@
RelativePath="..\..\src\server\shared\Configuration\Config.h" RelativePath="..\..\src\server\shared\Configuration\Config.h"
> >
</File> </File>
<File
RelativePath="..\..\src\server\shared\Configuration\ConfigEnv.h"
>
</File>
<Filter
Name="dotconfpp"
>
<File
RelativePath="..\..\src\server\shared\Configuration\dotconfpp\dotconfpp.cpp"
>
</File>
<File
RelativePath="..\..\src\server\shared\Configuration\dotconfpp\dotconfpp.h"
>
</File>
<File
RelativePath="..\..\src\server\shared\Configuration\dotconfpp\mempool.cpp"
>
</File>
<File
RelativePath="..\..\src\server\shared\Configuration\dotconfpp\mempool.h"
>
</File>
</Filter>
</Filter> </Filter>
<Filter <Filter
Name="Cryptography" Name="Cryptography"