From 271374e1b887d92f2a10b564e33a6781065c3d6f Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Mon, 7 Apr 2008 17:37:23 +0000 Subject: Merged changes made for the 0.0.24.1 release (4046:4048 from 0.0.24 branch). --- src/being.cpp | 8 +++++--- src/winver.h | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/being.cpp b/src/being.cpp index e76370fd..31e3eb77 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -418,10 +418,12 @@ Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY) if (!mEmotion) return; - int px = mPx + offsetX + 3; - int py = mPy + offsetY - 60; + const int px = mPx + offsetX + 3; + const int py = mPy + offsetY - 60; + const int emotionIndex = mEmotion - 1; - graphics->drawImage(emotionSet->get(mEmotion - 1), px, py); + if (emotionIndex >= 0 && emotionIndex < emotionSet->size()) + graphics->drawImage(emotionSet->get(emotionIndex), px, py); } void diff --git a/src/winver.h b/src/winver.h index 02d48f71..52d90315 100644 --- a/src/winver.h +++ b/src/winver.h @@ -2,5 +2,5 @@ #define VER_MAJOR 0 #define VER_MINOR 0 #define VER_RELEASE 24 -#define VER_BUILD 0 -#define PACKAGE_VERSION "0.0.24" +#define VER_BUILD 1 +#define PACKAGE_VERSION "0.0.24.1" -- cgit v1.2.3-70-g09d2