summaryrefslogtreecommitdiff
path: root/src/net/tmwa/messagein.cpp
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/net/tmwa/messagein.cpp
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/net/tmwa/messagein.cpp')
-rw-r--r--src/net/tmwa/messagein.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/net/tmwa/messagein.cpp b/src/net/tmwa/messagein.cpp
index 1a860a25..ca2d52ab 100644
--- a/src/net/tmwa/messagein.cpp
+++ b/src/net/tmwa/messagein.cpp
@@ -21,9 +21,6 @@
#include "net/tmwa/messagein.h"
-#include <SDL.h>
-#include <SDL_endian.h>
-
namespace TmwAthena {
MessageIn::MessageIn(const char *data, unsigned int length):
@@ -33,9 +30,9 @@ MessageIn::MessageIn(const char *data, unsigned int length):
mId = readInt16();
}
-Uint16 MessageIn::readInt16()
+uint16_t MessageIn::readInt16()
{
- Uint16 value = 0;
+ uint16_t value = 0;
if (mPos + 2 <= mLength)
{
value = (mData[mPos + 1] << 8) | mData[mPos];
@@ -44,9 +41,9 @@ Uint16 MessageIn::readInt16()
return value;
}
-Uint32 MessageIn::readInt32()
+uint32_t MessageIn::readInt32()
{
- Uint32 value = 0;
+ uint32_t value = 0;
if (mPos + 4 <= mLength)
{
value = (mData[mPos + 3] << 24) | (mData[mPos + 2] << 16) | (mData[mPos + 1] << 8) | mData[mPos];