summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--src/being.cpp9
-rw-r--r--src/being.h1
-rw-r--r--src/player.cpp1
4 files changed, 8 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index d3334a70..00bd7945 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
* src/openglgraphics.cpp: Set color back to current color instead of
setting it to white. Fixes white rectangles in equipment window.
+ * src/being.cpp, src/being.h, src/player.cpp: Specify the color in
+ which speech and names are supposed to be drawn. Removed unused
+ mSpeechColor member.
2006-05-12 Björn Steinbrink <B.Steinbrink@gmx.de>
@@ -12,7 +15,7 @@
* data/graphics/sprites/item1202.png,
data/graphics/sprites/Makefile.am, src/being.cpp, src/being.h,
src/localplayer.cpp, src/localplayer.h, src/main.cpp, src/player.cpp,
- The Mana World: You can now see the shirt when equipping a top
+ The Mana World: You can now see the shirt when equipping a top
equipment.
2006-05-05 Eugenio Favalli <elvenprogrammer@gmail.com>
diff --git a/src/being.cpp b/src/being.cpp
index 7ce31c93..a9bbc5e1 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -45,7 +45,6 @@ Being::Being(Uint32 id, Uint16 job, Map *map):
mJob(job),
mX(0), mY(0), mDirection(DOWN),
mAction(0), mFrame(0),
- mSpeechColor(0),
mWalkTime(0),
mEmotion(0), mEmotionTime(0),
mAttackSpeed(350),
@@ -191,11 +190,8 @@ Being::logic()
}
// Update pixel coordinates
- mPx = mX * 32;
- mPy = mY * 32;
-
- mPy += getYOffset();
- mPx += getXOffset();
+ mPx = mX * 32 + getXOffset();
+ mPy = mY * 32 + getYOffset();
if (mEmotion != 0)
{
@@ -240,6 +236,7 @@ Being::drawSpeech(Graphics *graphics, Sint32 offsetX, Sint32 offsetY)
if (mShowSpeech)
{
graphics->setFont(speechFont);
+ graphics->setColor(gcn::Color(255, 255, 255));
graphics->drawText(mSpeech, px + 18, py - 60, gcn::Graphics::CENTER);
}
diff --git a/src/being.h b/src/being.h
index 0dd8cd65..fbc03456 100644
--- a/src/being.h
+++ b/src/being.h
@@ -88,7 +88,6 @@ class Being : public Sprite
Uint8 mDirection; /**< Facing direction */
Uint8 mAction;
Uint8 mFrame;
- Sint32 mSpeechColor;
Uint16 mWalkTime;
Uint8 mEmotion; /**< Currently showing emotion */
Uint8 mEmotionTime; /**< Time until emotion disappears */
diff --git a/src/player.cpp b/src/player.cpp
index 54075206..c7e2d911 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -166,5 +166,6 @@ Player::drawName(Graphics *graphics, Sint32 offsetX, Sint32 offsetY)
int py = mPy + offsetY;
graphics->setFont(speechFont);
+ graphics->setColor(gcn::Color(255, 255, 255));
graphics->drawText(mName, px + 15, py + 30, gcn::Graphics::CENTER);
}