summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-01-17 16:49:05 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-01-17 16:49:05 +0000
commita7ab4b11e5bdbddad509f9b4ad62220145899ebc (patch)
tree24ebd8107b08d50d02d0c05c6d810626b653c03a
parent3055858d51016d659ab6e697398e0e98b61941e4 (diff)
downloadmana-a7ab4b11e5bdbddad509f9b4ad62220145899ebc.tar.gz
mana-a7ab4b11e5bdbddad509f9b4ad62220145899ebc.tar.bz2
mana-a7ab4b11e5bdbddad509f9b4ad62220145899ebc.tar.xz
mana-a7ab4b11e5bdbddad509f9b4ad62220145899ebc.zip
Changes to dev file.
-rw-r--r--The Mana World.dev6
-rw-r--r--src/log.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/The Mana World.dev b/The Mana World.dev
index 188c13ab..302906d9 100644
--- a/The Mana World.dev
+++ b/The Mana World.dev
@@ -27,7 +27,7 @@ CustomMakefile=
IncludeVersionInfo=1
SupportXPThemes=0
CompilerSet=0
-CompilerSettings=0010001001001000001101
+CompilerSettings=0010001001001001001001
[VersionInfo]
Major=0
@@ -36,7 +36,7 @@ Release=8
<<<<<<< The Mana World.dev
Build=809
=======
-Build=904
+Build=1
>>>>>>> 1.76
LanguageID=1033
CharsetID=1252
@@ -49,7 +49,7 @@ LegalTrademarks=
OriginalFilename=tmw.exe
ProductName=The Mana World MMORPG
ProductVersion=0.0.8
-AutoIncBuildNr=1
+AutoIncBuildNr=0
[Unit8]
FileName=src\log.cpp
diff --git a/src/log.cpp b/src/log.cpp
index 39d0183d..25d94faf 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -86,7 +86,7 @@ void error(const std::string error_text) {
log("Error", error_text.c_str());
#ifdef WIN32
- MessageBox(NULL, error_text.c_str(), "Error", MB_ICONERROR|MB_OK);
+ MessageBox(NULL, error_text.c_str(), "Error", MB_ICONERROR | MB_OK);
#else
fprintf(stderr, "Error: %s\n", error_text.c_str());
#endif