aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/server/authserver/Main.cpp3
-rw-r--r--src/server/shared/Common.h1
-rw-r--r--src/server/worldserver/Main.cpp3
-rw-r--r--win/VC90/shared.vcproj24
4 files changed, 4 insertions, 27 deletions
diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp
index 3954b3fa4c8..95dfb854b5e 100644
--- a/src/server/authserver/Main.cpp
+++ b/src/server/authserver/Main.cpp
@@ -165,7 +165,8 @@ extern int main(int argc, char **argv)
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;
}
sLog.Initialize();
diff --git a/src/server/shared/Common.h b/src/server/shared/Common.h
index f7407e78aac..371b20ba2f4 100644
--- a/src/server/shared/Common.h
+++ b/src/server/shared/Common.h
@@ -134,7 +134,6 @@
#define snprintf _snprintf
#define atoll __atoi64
#define vsnprintf _vsnprintf
-#define strdup _strdup
#define finite(X) _finite(X)
#else
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 3e3310c613a..6d6e595772c 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -133,7 +133,8 @@ extern int main(int argc, char **argv)
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;
}
sLog.outString("Using configuration file %s.", cfg_file);
diff --git a/win/VC90/shared.vcproj b/win/VC90/shared.vcproj
index f3908ec4596..4ad2f97aa5f 100644
--- a/win/VC90/shared.vcproj
+++ b/win/VC90/shared.vcproj
@@ -364,30 +364,6 @@
RelativePath="..\..\src\server\shared\Configuration\Config.h"
>
</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
Name="Cryptography"