diff options
author | Ira Rice <irarice@gmail.com> | 2009-01-16 15:16:14 -0700 |
---|---|---|
committer | Ira Rice <irarice@gmail.com> | 2009-01-16 15:16:14 -0700 |
commit | b9d0f267913c61cd6b490171768bd88c3a472563 (patch) | |
tree | 82f6998ebcfb6a7f8e439a2360e89ec06726e5c2 /src | |
parent | 02010c3e8e2ee08bf49b360fd091dd8b2abc6b15 (diff) | |
download | mana-client-b9d0f267913c61cd6b490171768bd88c3a472563.tar.gz mana-client-b9d0f267913c61cd6b490171768bd88c3a472563.tar.bz2 mana-client-b9d0f267913c61cd6b490171768bd88c3a472563.tar.xz mana-client-b9d0f267913c61cd6b490171768bd88c3a472563.zip |
Candidate release for 0.0.27.1 (Windows needs to get colors fixed, and
then this build might be official)
Signed-off-by: Ira Rice <irarice@gmail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/emotecontainer.cpp | 4 | ||||
-rw-r--r-- | src/gui/emoteshortcutcontainer.cpp | 2 | ||||
-rw-r--r-- | src/main.cpp | 2 | ||||
-rw-r--r-- | src/resources/emotedb.cpp | 5 | ||||
-rw-r--r-- | src/resources/emotedb.h | 2 | ||||
-rw-r--r-- | src/winver.h | 4 |
6 files changed, 4 insertions, 15 deletions
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" |