diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | configure.ac | 2 | ||||
| -rw-r--r-- | src/aethyra.rc | 2 | ||||
| -rw-r--r-- | src/being.cpp | 2 | ||||
| -rw-r--r-- | src/gui/setup_video.cpp | 4 | ||||
| -rw-r--r-- | src/gui/table.cpp | 2 | ||||
| -rw-r--r-- | src/gui/table.h | 2 | ||||
| -rw-r--r-- | src/winver.h | 6 |
8 files changed, 11 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 365f0944..49c21cbd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ PROJECT(AETHYRA) -SET(VERSION 0.0.27.1) +SET(VERSION 0.0.29) # where to look for cmake modules SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules) diff --git a/configure.ac b/configure.ac index 468a85d2..a774df8f 100755 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([Aethyra], [0.0.27.1], [irarice@gmail.com], [aethyra]) +AC_INIT([Aethyra], [0.0.29], [irarice@gmail.com], [aethyra]) AC_CONFIG_HEADERS([config.h:config.h.in]) AC_LANG_CPLUSPLUS diff --git a/src/aethyra.rc b/src/aethyra.rc index d2db954f..e9d32be9 100644 --- a/src/aethyra.rc +++ b/src/aethyra.rc @@ -13,7 +13,7 @@ FILETYPE VFT_APP { VALUE "CompanyName", "Aethyra Development Team"
VALUE "FileVersion", PACKAGE_VERSION
VALUE "FileDescription", "Aethyra Experiment"
- VALUE "LegalCopyright", "2008 (C)"
+ VALUE "LegalCopyright", "2009 (C)"
VALUE "OriginalFilename", "aethyra.exe"
VALUE "ProductName", "Aethyra MMORPG"
VALUE "ProductVersion", PACKAGE_VERSION
diff --git a/src/being.cpp b/src/being.cpp index d847b032..8e07514f 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -492,7 +492,7 @@ void Being::drawSpeech(int offsetX, int offsetY) { const int px = mPx + offsetX; const int py = mPy + offsetY; - const int speech = config.getValue("speech", NAME_IN_BUBBLE); + const int speech = (int) config.getValue("speech", NAME_IN_BUBBLE); // Draw speech above this being if (mSpeechTime > 0 && (speech == NAME_IN_BUBBLE || diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index bf5682e6..e1a148d8 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -112,7 +112,7 @@ Setup_Video::Setup_Video(): mNameEnabled(config.getValue("showownname", false)), mOpacity(config.getValue("guialpha", 0.8)), mFps((int) config.getValue("fpslimit", 0)), - mSpeechMode(config.getValue("speech", 3)), + mSpeechMode((int) config.getValue("speech", 3)), mModeListModel(new ModeListModel), mModeList(new ListBox(mModeListModel)), mFsCheckBox(new CheckBox(_("Full screen"), mFullScreenEnabled)), @@ -389,7 +389,7 @@ void Setup_Video::apply() mCustomCursorEnabled = config.getValue("customcursor", true); mParticleEffectsEnabled = config.getValue("particleeffects", true); mNameEnabled = config.getValue("showownname", false); - mSpeechMode = config.getValue("speech", 3); + mSpeechMode = (int) config.getValue("speech", 3); mOpacity = config.getValue("guialpha", 0.8); mOverlayDetail = (int) config.getValue("OverlayDetail", 2); mOpenGLEnabled = config.getValue("opengl", false); diff --git a/src/gui/table.cpp b/src/gui/table.cpp index 1793948b..8acbc4f4 100644 --- a/src/gui/table.cpp +++ b/src/gui/table.cpp @@ -1,6 +1,6 @@ /* * Aethyra - * Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net> + * Copyright (C) 2008 The Mana World Development Team * * This file is part of Aethyra derived from original code * from Guichan. diff --git a/src/gui/table.h b/src/gui/table.h index c84272a3..a508d0e4 100644 --- a/src/gui/table.h +++ b/src/gui/table.h @@ -1,6 +1,6 @@ /* * Aethyra - * Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net> + * Copyright (C) 2008 The Mana World Development Team * * This file is part of Aethyra derived from original code * from Guichan. diff --git a/src/winver.h b/src/winver.h index ac53cd73..a10e2e76 100644 --- a/src/winver.h +++ b/src/winver.h @@ -1,6 +1,6 @@ /* VERSION DEFINITIONS */
#define VER_MAJOR 0
#define VER_MINOR 0
-#define VER_RELEASE 27
-#define VER_BUILD 1
-#define PACKAGE_VERSION "0.0.27.1" +#define VER_RELEASE 29
+#define VER_BUILD 0
+#define PACKAGE_VERSION "0.0.29" |