From b4033b9953f1c1eaf9778b70f1a05d79af83983a Mon Sep 17 00:00:00 2001
From: gered <gered@blarg.ca>
Date: Tue, 2 Apr 2013 19:41:13 -0400
Subject: [PATCH] fix missing int/uint type changes

---
 src/framework/input/marmalademouse.cpp | 8 ++++----
 src/framework/marmaladesystem.h        | 2 +-
 src/framework/util/msgbox.cpp          | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/framework/input/marmalademouse.cpp b/src/framework/input/marmalademouse.cpp
index 93aa88d..63f4014 100644
--- a/src/framework/input/marmalademouse.cpp
+++ b/src/framework/input/marmalademouse.cpp
@@ -5,7 +5,7 @@
 #include "mouselistener.h"
 #include <string.h>
 
-const int32_t NUM_BUTTONS = S3E_POINTER_BUTTON_MAX;
+const int NUM_BUTTONS = S3E_POINTER_BUTTON_MAX;
 
 MarmaladeMouse::MarmaladeMouse()
 {
@@ -29,7 +29,7 @@ void MarmaladeMouse::ResetDeltas()
 
 bool MarmaladeMouse::OnButtonEvent(const s3ePointerEvent *eventArgs)
 {
-	int button = (int32_t)eventArgs->m_Button;
+	int button = (int)eventArgs->m_Button;
 	bool isDown = (bool)eventArgs->m_Pressed;
 	int x = eventArgs->m_x;
 	int y = eventArgs->m_y;
@@ -44,7 +44,7 @@ bool MarmaladeMouse::OnButtonEvent(const s3ePointerEvent *eventArgs)
 		//       don't have support for it (yet)
 		for (stl::set<MouseListener*>::iterator i = m_listeners.begin(); i != m_listeners.end(); ++i)
 		{
-			if ((*i)->OnMouseButtonDown((MOUSE_BUTTONS)button, (uint16_t)x, (uint16_t)y))
+			if ((*i)->OnMouseButtonDown((MOUSE_BUTTONS)button, (uint)x, (uint)y))
 				break;
 		}
 	}
@@ -55,7 +55,7 @@ bool MarmaladeMouse::OnButtonEvent(const s3ePointerEvent *eventArgs)
 		{
 			for (stl::set<MouseListener*>::iterator i = m_listeners.begin(); i != m_listeners.end(); ++i)
 			{
-				if ((*i)->OnMouseButtonUp((MOUSE_BUTTONS)button, (uint16_t)x, (uint16_t)y))
+				if ((*i)->OnMouseButtonUp((MOUSE_BUTTONS)button, (uint)x, (uint)y))
 					break;
 			}
 		}
diff --git a/src/framework/marmaladesystem.h b/src/framework/marmaladesystem.h
index cfc2664..702cc19 100644
--- a/src/framework/marmaladesystem.h
+++ b/src/framework/marmaladesystem.h
@@ -44,7 +44,7 @@ public:
 	Keyboard* GetKeyboard() const                          { return (Keyboard*)m_keyboard; }
 	Touchscreen* GetTouchscreen() const                    { return (Touchscreen*)m_touchscreen; }
 
-	uint GetTicks() const                                  { return (uint32_t)s3eTimerGetMs(); }
+	uint GetTicks() const                                  { return (uint)s3eTimerGetMs(); }
 	void Delay(uint milliseconds) const;
 
 private:
diff --git a/src/framework/util/msgbox.cpp b/src/framework/util/msgbox.cpp
index 1c9cd5c..5ebf8b0 100644
--- a/src/framework/util/msgbox.cpp
+++ b/src/framework/util/msgbox.cpp
@@ -32,7 +32,7 @@ uint ConvertMsgBoxTypeToSysMsgBoxIcon(MSGBOX_TYPE type);
 	#define WIN32_EXTRA_LEAN
 	#include <windows.h>
 
-	MSGBOX_RESULT SystemMessageBox(const stl::string& message, const stl::string& caption, uint32_t flags);
+	MSGBOX_RESULT SystemMessageBox(const stl::string& message, const stl::string& caption, uint flags);
 
 #elif defined MSGBOX_OSX