From 3c0cb0e058324ee1d3116017f14387e9a6004442 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Fri, 3 Jun 2011 11:19:20 -0600 Subject: Replace SDL_types.h with cstdint MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This required moving to C++0x, so it does that too, and fixes a few errors with that. Reviewed-by: Thorbjørn Lindeijer --- src/net/tmwa/messagein.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/net/tmwa/messagein.cpp') 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 -#include - 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]; -- cgit v1.2.3-70-g09d2