diff options
| author | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2007-07-08 14:38:12 +0000 |
|---|---|---|
| committer | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2007-07-08 14:38:12 +0000 |
| commit | d72e1987f9703d2e3a37ad930a1bc8ceaf525065 (patch) | |
| tree | ac3261e9e39825336514ef1ab11a6f2d5cd8c7ea | |
| parent | 016faf8449aeb7dba2738da4fefa3609b3af589c (diff) | |
| download | mana-d72e1987f9703d2e3a37ad930a1bc8ceaf525065.tar.gz mana-d72e1987f9703d2e3a37ad930a1bc8ceaf525065.tar.bz2 mana-d72e1987f9703d2e3a37ad930a1bc8ceaf525065.tar.xz mana-d72e1987f9703d2e3a37ad930a1bc8ceaf525065.zip | |
Changed signatures to prevent the wrong members to be overloaded on architectures with 64-bit integers and to shut some compiler warnings.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | src/being.h | 2 | ||||
| -rw-r--r-- | src/localplayer.h | 2 | ||||
| -rw-r--r-- | src/player.cpp | 2 | ||||
| -rw-r--r-- | src/player.h | 2 |
5 files changed, 12 insertions, 6 deletions
@@ -1,4 +1,10 @@ -2007-07-07 Bjørn Lindeijer <bjorn@lindeijer.nl> +2007-07-08 Guillaume Melquiond <guillaume.melquiond@gmail.com> + + * src/player.cpp, src/player.h, src/localplayer.h, src/being.h: Changed + signatures to prevent the wrong members to be overloaded on + architectures with 64-bit integers and to shut some compiler warnings. + +2007-07-07 Bjørn Lindeijer <bjorn@lindeijer.nl> * src/gui/gui.cpp, src/gui/chatinput.h, src/gui/chatinput.cpp, INSTALL: Ported to Guichan 0.7.0. Unfortunately, since Guichan 0.6.x @@ -33,7 +39,7 @@ data/graphics/sprites/chest-lightplatemail-female.xml: Added light platemail (see entry in items.xml for proposed specs). -2007-06-16 Guillaume Melquiond <guillaume.melquiong@gmail.com> +2007-06-16 Guillaume Melquiond <guillaume.melquiond@gmail.com> * src/resources/image.cpp: Set GL texture index to zero when an image uses the SDL backend. diff --git a/src/being.h b/src/being.h index 8820c30a..afb3cb8b 100644 --- a/src/being.h +++ b/src/being.h @@ -259,7 +259,7 @@ class Being : public Sprite * Draws the name text below the being. */ virtual void - drawName(Graphics *graphics, int offsetX, int offsetY) {}; + drawName(Graphics *, int, int) {}; /** * Returns the type of the being. diff --git a/src/localplayer.h b/src/localplayer.h index fb7703dd..c3a74b52 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -129,7 +129,7 @@ class LocalPlayer : public Player * Draws the name text below the being. */ virtual void - drawName(Graphics *graphics, Sint32 offsetX, Sint32 offsetY) {}; + drawName(Graphics *, int, int) {}; virtual Type getType() const; diff --git a/src/player.cpp b/src/player.cpp index 288401e4..d3c27aa0 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -47,7 +47,7 @@ Player::getType() const } void -Player::drawName(Graphics *graphics, Sint32 offsetX, Sint32 offsetY) +Player::drawName(Graphics *graphics, int offsetX, int offsetY) { int px = mPx + offsetX; int py = mPy + offsetY; diff --git a/src/player.h b/src/player.h index b062a55f..8aa84992 100644 --- a/src/player.h +++ b/src/player.h @@ -46,7 +46,7 @@ class Player : public Being getType() const; virtual void - drawName(Graphics *graphics, Sint32 offsetX, Sint32 offsetY); + drawName(Graphics *graphics, int offsetX, int offsetY); virtual void setSex(Uint8 sex); |