gered/MyGameFramework
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix missing int/uint type changes

Browse source
This commit is contained in:
Gered 2013-04-02 19:41:13 -04:00
parent 4ce9c3c53a
commit b4033b9953
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/framework/input/marmalademouse.cpp
View file

@ -5,7 +5,7 @@
#include "mouselistener.h" #include "mouselistener.h"
#include <string.h> #include <string.h>
const int32_t NUM_BUTTONS = S3E_POINTER_BUTTON_MAX; const int NUM_BUTTONS = S3E_POINTER_BUTTON_MAX;
MarmaladeMouse::MarmaladeMouse() MarmaladeMouse::MarmaladeMouse()
{ {
@ -29,7 +29,7 @@ void MarmaladeMouse::ResetDeltas()
bool MarmaladeMouse::OnButtonEvent(const s3ePointerEvent *eventArgs) 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; bool isDown = (bool)eventArgs->m_Pressed;
int x = eventArgs->m_x; int x = eventArgs->m_x;
int y = eventArgs->m_y; int y = eventArgs->m_y;
@ -44,7 +44,7 @@ bool MarmaladeMouse::OnButtonEvent(const s3ePointerEvent *eventArgs)
// don't have support for it (yet) // don't have support for it (yet)
for (stl::set<MouseListener*>::iterator i = m_listeners.begin(); i != m_listeners.end(); ++i) 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; 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) 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; break;
} }
} }

2
src/framework/marmaladesystem.h
View file

@ -44,7 +44,7 @@ public:
Keyboard* GetKeyboard() const { return (Keyboard*)m_keyboard; } Keyboard* GetKeyboard() const { return (Keyboard*)m_keyboard; }
Touchscreen* GetTouchscreen() const { return (Touchscreen*)m_touchscreen; } 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; void Delay(uint milliseconds) const;
private: private:

2
src/framework/util/msgbox.cpp
View file

@ -32,7 +32,7 @@ uint ConvertMsgBoxTypeToSysMsgBoxIcon(MSGBOX_TYPE type);
#define WIN32_EXTRA_LEAN #define WIN32_EXTRA_LEAN
#include <windows.h> #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 #elif defined MSGBOX_OSX