From a84133850af6d348c0c4e252b26618148702153b Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Thu, 20 Sep 2007 13:24:20 +0000 Subject: Merged a bunch of small changes from trunk to 0.0 and set svn:eol-style to native for some files that were still missing this property. This is a feeble attempt to reduce the amount of conflicts for future merges. --- src/being.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index b0fde6d1..bfd35e21 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -415,7 +415,7 @@ Being::draw(Graphics *graphics, int offsetX, int offsetY) const } void -Being::drawEmotion(Graphics *graphics, Sint32 offsetX, Sint32 offsetY) +Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY) { if (!mEmotion) return; @@ -427,7 +427,7 @@ Being::drawEmotion(Graphics *graphics, Sint32 offsetX, Sint32 offsetY) } void -Being::drawSpeech(Graphics *graphics, Sint32 offsetX, Sint32 offsetY) +Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY) { int px = mPx + offsetX; int py = mPy + offsetY; -- cgit v1.2.3-60-g2f50