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/actorspritemanager.cpp | |
| 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/actorspritemanager.cpp')
| -rw-r--r-- | src/actorspritemanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp index 2437f7f7..0134dd63 100644 --- a/src/actorspritemanager.cpp +++ b/src/actorspritemanager.cpp @@ -39,7 +39,7 @@ class FindBeingFunctor return false; Being* b = static_cast<Being*>(actor); - Uint16 other_y = y + ((b->getType() == ActorSprite::NPC) ? 1 : 0); + uint16_t other_y = y + ((b->getType() == ActorSprite::NPC) ? 1 : 0); const Vector &pos = b->getPosition(); return ((int) pos.x / 32 == x && ((int) pos.y / 32 == y || (int) pos.y / 32 == other_y) && @@ -47,7 +47,7 @@ class FindBeingFunctor (type == ActorSprite::UNKNOWN || b->getType() == type)); } - Uint16 x, y; + uint16_t x, y; ActorSprite::Type type; } beingFinder; |