summaryrefslogtreecommitdiff
path: root/src/being.h
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2011-06-03 11:19:20 -0600
committerJared Adams <jaxad0127@gmail.com>2011-06-03 12:08:26 -0600
commit3c0cb0e058324ee1d3116017f14387e9a6004442 (patch)
treeb9c00c3fdf1dff7e4c07bf4f8c83c2e7bc03c0f7 /src/being.h
parent894038adf52a3e2b42542239a147d6c1cc1ad204 (diff)
downloadmana-3c0cb0e058324ee1d3116017f14387e9a6004442.tar.gz
mana-3c0cb0e058324ee1d3116017f14387e9a6004442.tar.bz2
mana-3c0cb0e058324ee1d3116017f14387e9a6004442.tar.xz
mana-3c0cb0e058324ee1d3116017f14387e9a6004442.zip
Replace SDL_types.h with cstdint
This required moving to C++0x, so it does that too, and fixes a few errors with that. Reviewed-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
Diffstat (limited to 'src/being.h')
-rw-r--r--src/being.h16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/being.h b/src/being.h
index 76e2edae..55d49620 100644
--- a/src/being.h
+++ b/src/being.h
@@ -30,8 +30,6 @@
#include <guichan/color.hpp>
-#include <SDL_types.h>
-
#include <map>
#include <set>
#include <string>
@@ -289,12 +287,12 @@ class Being : public ActorSprite, public EventListener
*/
void drawSpeech(int offsetX, int offsetY);
- Uint16 getSubType() const { return mSubType; }
+ uint16_t getSubType() const { return mSubType; }
/**
* Set Being's subtype (mostly for view for monsters and NPCs)
*/
- void setSubtype(Uint16 subtype);
+ void setSubtype(uint16_t subtype);
const BeingInfo *getInfo() const
{ return mInfo; }
@@ -356,12 +354,12 @@ class Being : public ActorSprite, public EventListener
/**
* Returns the current direction.
*/
- Uint8 getDirection() const { return mDirection; }
+ uint8_t getDirection() const { return mDirection; }
/**
* Sets the current direction.
*/
- void setDirection(Uint8 direction);
+ void setDirection(uint8_t direction);
/**
* Returns the direction the being is facing.
@@ -475,10 +473,10 @@ class Being : public ActorSprite, public EventListener
int mAttackSpeed; /**< Attack speed */
Action mAction; /**< Action the being is performing */
- Uint16 mSubType; /**< Subtype (graphical view, basically) */
+ uint16_t mSubType; /**< Subtype (graphical view, basically) */
- Uint8 mDirection; /**< Facing direction */
- Uint8 mSpriteDirection; /**< Facing direction */
+ uint8_t mDirection; /**< Facing direction */
+ uint8_t mSpriteDirection; /**< Facing direction */
std::string mName; /**< Name of character */
std::string mPartyName;