diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-09-20 13:24:20 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-09-20 13:24:20 +0000 |
| commit | a84133850af6d348c0c4e252b26618148702153b (patch) | |
| tree | f4b8d7c9bbdeecd9c1976bdc3d3806909a25cd28 /src/being.cpp | |
| parent | 1afcf2608c0a466d2df21faea1530955cc8061fc (diff) | |
| download | mana-a84133850af6d348c0c4e252b26618148702153b.tar.gz mana-a84133850af6d348c0c4e252b26618148702153b.tar.bz2 mana-a84133850af6d348c0c4e252b26618148702153b.tar.xz mana-a84133850af6d348c0c4e252b26618148702153b.zip | |
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.
Diffstat (limited to 'src/being.cpp')
| -rw-r--r-- | src/being.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; |