diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/main.cpp | 5 | ||||
| -rw-r--r-- | src/main.h | 8 |
3 files changed, 16 insertions, 5 deletions
@@ -1,12 +1,16 @@ 2005-12-05 Bjørn Lindeijer <bjorn@lindeijer.nl> + * src/main.h, src/main.cpp: Display TMW version on Windows too. + +2005-12-05 Bjørn Lindeijer <bjorn@lindeijer.nl> + * src/gui/char_server.cpp: Avoid crashing on trying to log the name of a non-existing character. 2005-11-13 Eugenio Favalli <elvenprogrammer@gmail.com> * The Mana World.dev: Updated Dev-Cpp project file. - + 2005-11-13 Bjørn Lindeijer <bjorn@lindeijer.nl> * data/maps/new_1-1.tmx.gz, data/maps/new_3-1.tmx.gz, @@ -17,7 +21,7 @@ 2005-10-24 Ferreira Yohann <Bertram@cegetel.net> * src/main.cpp: Add version displaying at startup. - * docs/NSTALL/debian.txt: Updated Debian Install Doc. + * docs/INSTALL/debian.txt: Updated Debian Install Doc. 2005-10-20 Björn Steinbrink <B.Steinbrink@gmx.de> diff --git a/src/main.cpp b/src/main.cpp index e28c843b..e745e7cd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -36,7 +36,6 @@ #ifdef __USE_UNIX98 #include <cerrno> #include <sys/stat.h> -#include "../config.h" #endif #include "configuration.h" @@ -380,7 +379,7 @@ void parseOptions(int argc, char *argv[], Options &options) /** Main */ int main(int argc, char *argv[]) { -#ifdef __USE_UNIX98 +#ifdef PACKAGE_VERSION std::cout << "The Mana World v" << PACKAGE_VERSION << std::endl; #endif logger = new Logger(); @@ -456,7 +455,7 @@ int main(int argc, char *argv[]) } graphics->drawImage(login_wallpaper, 0, 0); -#ifdef __USE_UNIX98 +#ifdef PACKAGE_VERSION graphics->setFont(gui->getFont()); graphics->drawText(PACKAGE_VERSION, 0, 0); #endif @@ -29,10 +29,18 @@ class Image; class Sound; +#ifdef __USE_UNIX98 +#include "../config.h" +#else +#include "../The_Mana_World_private.h" +#define PACKAGE_VERSION PRODUCT_VERSION +#endif + #ifndef TMW_DATADIR #define TMW_DATADIR "" #endif + enum { EXIT_STATE, LOGIN_STATE, |