summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt2
-rw-r--r--aethyra.cbp17
-rwxr-xr-xconfigure.ac2
-rw-r--r--data/help/header.txt2
-rw-r--r--data/help/team.txt6
-rw-r--r--src/gui/emotecontainer.cpp4
-rw-r--r--src/gui/emoteshortcutcontainer.cpp2
-rw-r--r--src/main.cpp2
-rw-r--r--src/resources/emotedb.cpp5
-rw-r--r--src/resources/emotedb.h2
-rw-r--r--src/winver.h4
11 files changed, 26 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ac379de..365f0944 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
PROJECT(AETHYRA)
-SET(VERSION 0.0.27)
+SET(VERSION 0.0.27.1)
# where to look for cmake modules
SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules)
diff --git a/aethyra.cbp b/aethyra.cbp
index 67d8d7d2..68d4a609 100644
--- a/aethyra.cbp
+++ b/aethyra.cbp
@@ -167,10 +167,10 @@
<Unit filename="src\gui\item_amount.h" />
<Unit filename="src\gui\itemcontainer.cpp" />
<Unit filename="src\gui\itemcontainer.h" />
+ <Unit filename="src\gui\itempopup.cpp" />
+ <Unit filename="src\gui\itempopup.h" />
<Unit filename="src\gui\itemshortcutcontainer.cpp" />
<Unit filename="src\gui\itemshortcutcontainer.h" />
- <Unit filename="src\gui\itemshortcutwindow.cpp" />
- <Unit filename="src\gui\itemshortcutwindow.h" />
<Unit filename="src\gui\linkhandler.h" />
<Unit filename="src\gui\listbox.cpp" />
<Unit filename="src\gui\listbox.h" />
@@ -202,6 +202,8 @@
<Unit filename="src\gui\register.h" />
<Unit filename="src\gui\scrollarea.cpp" />
<Unit filename="src\gui\scrollarea.h" />
+ <Unit filename="src\gui\sdlinput.cpp" />
+ <Unit filename="src\gui\sdlinput.h" />
<Unit filename="src\gui\sell.cpp" />
<Unit filename="src\gui\sell.h" />
<Unit filename="src\gui\setup.cpp" />
@@ -235,8 +237,6 @@
<Unit filename="src\gui\speechbubble.h" />
<Unit filename="src\gui\status.cpp" />
<Unit filename="src\gui\status.h" />
- <Unit filename="src\gui\tabbedcontainer.cpp" />
- <Unit filename="src\gui\tabbedcontainer.h" />
<Unit filename="src\gui\table.cpp" />
<Unit filename="src\gui\table.h" />
<Unit filename="src\gui\table_model.cpp" />
@@ -255,8 +255,14 @@
<Unit filename="src\gui\viewport.h" />
<Unit filename="src\gui\widgets\dropdown.cpp" />
<Unit filename="src\gui\widgets\dropdown.h" />
+ <Unit filename="src\gui\widgets\layout.cpp" />
+ <Unit filename="src\gui\widgets\layout.h" />
<Unit filename="src\gui\widgets\resizegrip.cpp" />
<Unit filename="src\gui\widgets\resizegrip.h" />
+ <Unit filename="src\gui\widgets\tab.cpp" />
+ <Unit filename="src\gui\widgets\tab.h" />
+ <Unit filename="src\gui\widgets\tabbedarea.cpp" />
+ <Unit filename="src\gui\widgets\tabbedarea.h" />
<Unit filename="src\gui\window.cpp" />
<Unit filename="src\gui\window.h" />
<Unit filename="src\gui\windowcontainer.cpp" />
@@ -358,6 +364,8 @@
<Unit filename="src\resources\colordb.h" />
<Unit filename="src\resources\dye.cpp" />
<Unit filename="src\resources\dye.h" />
+ <Unit filename="src\resources\emotedb.cpp" />
+ <Unit filename="src\resources\emotedb.h" />
<Unit filename="src\resources\image.cpp" />
<Unit filename="src\resources\image.h" />
<Unit filename="src\resources\imageloader.cpp" />
@@ -407,6 +415,7 @@
<Unit filename="src\utils\base64.h" />
<Unit filename="src\utils\dtor.h" />
<Unit filename="src\utils\fastsqrt.h" />
+ <Unit filename="src\utils\gettext.h" />
<Unit filename="src\utils\mutex.h" />
<Unit filename="src\utils\strprintf.cpp" />
<Unit filename="src\utils\strprintf.h" />
diff --git a/configure.ac b/configure.ac
index e4acb4df..468a85d2 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.59)
-AC_INIT([Aethyra], [SVN-0.0.27], [irarice@gmail.com], [aethyra])
+AC_INIT([Aethyra], [0.0.27.1], [irarice@gmail.com], [aethyra])
AC_CONFIG_HEADERS([config.h:config.h.in])
AC_LANG_CPLUSPLUS
diff --git a/data/help/header.txt b/data/help/header.txt
index f70426fe..38604d70 100644
--- a/data/help/header.txt
+++ b/data/help/header.txt
@@ -2,7 +2,7 @@
##1 AETHYRA
##1 ==========================================
- ##2Version:##6 Aethyra GIT 0.0.27 ##2Date:##7 December 2008
+ ##2Version:##6 Aethyra GIT 0.0.27.1 ##2Date:##16 January 2008
##2 Website: http://www.aethyra.org
diff --git a/data/help/team.txt b/data/help/team.txt
index dfd00d4b..6b2fae88 100644
--- a/data/help/team.txt
+++ b/data/help/team.txt
@@ -17,6 +17,8 @@
##9Kraant Developer
<kraant@gmail.com>
+
+ ##9Forge Developer
##2 Artists:
@@ -32,6 +34,8 @@
##9GonzoDark Mapper
+ ##9Solo Mapper
+
##2 Content Development:
##9Moose
@@ -42,6 +46,8 @@
##9SoftLace1
+ ##9Mr. and Mrs. Solo
+
##9Srauls
##2 Misc. thanks:
diff --git a/src/gui/emotecontainer.cpp b/src/gui/emotecontainer.cpp
index cba744dd..fa63d4bb 100644
--- a/src/gui/emotecontainer.cpp
+++ b/src/gui/emotecontainer.cpp
@@ -23,10 +23,10 @@
#include <guichan/selectionlistener.hpp>
#include "emotecontainer.h"
-#include "emoteshortcut.h"
#include "../animatedsprite.h"
#include "../configuration.h"
+#include "../emoteshortcut.h"
#include "../graphics.h"
#include "../localplayer.h"
#include "../log.h"
@@ -69,8 +69,6 @@ EmoteContainer::EmoteContainer():
EmoteContainer::~EmoteContainer()
{
- delete_all(mEmoteImg);
-
if (!mSelImg)
{
mSelImg->decRef();
diff --git a/src/gui/emoteshortcutcontainer.cpp b/src/gui/emoteshortcutcontainer.cpp
index f7917f85..f5ee9843 100644
--- a/src/gui/emoteshortcutcontainer.cpp
+++ b/src/gui/emoteshortcutcontainer.cpp
@@ -69,8 +69,6 @@ EmoteShortcutContainer::EmoteShortcutContainer():
EmoteShortcutContainer::~EmoteShortcutContainer()
{
mBackgroundImg->decRef();
-
- delete_all(mEmoteImg);
}
void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
diff --git a/src/main.cpp b/src/main.cpp
index a1109092..ea120fc4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -748,7 +748,7 @@ int main(int argc, char *argv[])
gcn::Label *versionLabel = new gcn::Label(PACKAGE_VERSION);
top->add(versionLabel, 2, 2);
#endif
- ProgressBar *progressBar = new ProgressBar(0.0f, 100, 20);
+ ProgressBar *progressBar = new ProgressBar(0.0f, 100, 20, 168, 116, 31);
gcn::Label *progressLabel = new gcn::Label();
top->add(progressBar, 5, top->getHeight() - 5 - progressBar->getHeight());
top->add(progressLabel, 15 + progressBar->getWidth(),
diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp
index 03096eff..2f43822d 100644
--- a/src/resources/emotedb.cpp
+++ b/src/resources/emotedb.cpp
@@ -137,11 +137,6 @@ const EmoteInfo& EmoteDB::get(int id)
}
}
-const EmoteInfo& EmoteDB::getUnknown()
-{
- return mUnknown;
-}
-
const int& EmoteDB::getLast()
{
return mLastEmote;
diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h
index 9e904cc1..73354ec0 100644
--- a/src/resources/emotedb.h
+++ b/src/resources/emotedb.h
@@ -52,8 +52,6 @@ namespace EmoteDB
const EmoteInfo& get(int id);
- const EmoteInfo& getUnknown();
-
const int& getLast();
typedef EmoteInfos::iterator EmoteInfosIterator;
diff --git a/src/winver.h b/src/winver.h
index f56d0c6b..ac53cd73 100644
--- a/src/winver.h
+++ b/src/winver.h
@@ -2,5 +2,5 @@
#define VER_MAJOR 0
#define VER_MINOR 0
#define VER_RELEASE 27
-#define VER_BUILD 0
-#define PACKAGE_VERSION "0.0.27"
+#define VER_BUILD 1
+#define PACKAGE_VERSION "0.0.27.1"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-22 06:05:15 +0000