diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2011-06-03 11:19:20 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2011-06-03 12:08:26 -0600 |
| commit | 3c0cb0e058324ee1d3116017f14387e9a6004442 (patch) | |
| tree | b9c00c3fdf1dff7e4c07bf4f8c83c2e7bc03c0f7 /src/actorsprite.h | |
| parent | 894038adf52a3e2b42542239a147d6c1cc1ad204 (diff) | |
| download | mana-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/actorsprite.h')
| -rw-r--r-- | src/actorsprite.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/actorsprite.h b/src/actorsprite.h index ab945d2f..81bbd963 100644 --- a/src/actorsprite.h +++ b/src/actorsprite.h @@ -26,8 +26,7 @@ #include "map.h" #include "particlecontainer.h" -#include <SDL_types.h> - +#include <cstdint> #include <set> #include <list> @@ -143,7 +142,7 @@ public: * * These are NOT the same as the status effect indices. */ - void setStatusEffectBlock(int offset, Uint16 flags); + void setStatusEffectBlock(int offset, uint16_t flags); virtual void setAlpha(float alpha) { CompoundSprite::setAlpha(alpha); } @@ -195,7 +194,7 @@ protected: bool forceDisplay = true); int mId; - Uint16 mStunMode; /**< Stun mode; zero if not stunned */ + uint16_t mStunMode; /**< Stun mode; zero if not stunned */ std::set<int> mStatusEffects; /**< set of active status effects */ ParticleList mStunParticleEffects; |