diff options
-rw-r--r-- | backends/platform/wii/osystem.cpp | 6 | ||||
-rw-r--r-- | backends/platform/wii/osystem_events.cpp | 6 | ||||
-rw-r--r-- | backends/platform/wii/osystem_gfx.cpp | 2 | ||||
-rw-r--r-- | backends/platform/wii/osystem_sfx.cpp | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/backends/platform/wii/osystem.cpp b/backends/platform/wii/osystem.cpp index ab2f2c6f0f..c2751f6ef4 100644 --- a/backends/platform/wii/osystem.cpp +++ b/backends/platform/wii/osystem.cpp @@ -229,21 +229,21 @@ void OSystem_Wii::lockMutex(MutexRef mutex) { s32 res = LWP_MutexLock(*(mutex_t *)mutex); if (res) - printf("ERROR locking mutex %p (%d)\n", mutex, res); + printf("ERROR locking mutex %p (%ld)\n", mutex, res); } void OSystem_Wii::unlockMutex(MutexRef mutex) { s32 res = LWP_MutexUnlock(*(mutex_t *)mutex); if (res) - printf("ERROR unlocking mutex %p (%d)\n", mutex, res); + printf("ERROR unlocking mutex %p (%ld)\n", mutex, res); } void OSystem_Wii::deleteMutex(MutexRef mutex) { s32 res = LWP_MutexDestroy(*(mutex_t *)mutex); if (res) - printf("ERROR destroying mutex %p (%d)\n", mutex, res); + printf("ERROR destroying mutex %p (%ld)\n", mutex, res); free(mutex); } diff --git a/backends/platform/wii/osystem_events.cpp b/backends/platform/wii/osystem_events.cpp index 13f5d1fbe0..2499300a56 100644 --- a/backends/platform/wii/osystem_events.cpp +++ b/backends/platform/wii/osystem_events.cpp @@ -172,7 +172,7 @@ void OSystem_Wii::initEvents() { TIMER_THREAD_PRIO); if (res) { - printf("ERROR creating timer thread: %d\n", res); + printf("ERROR creating timer thread: %ld\n", res); LWP_CloseQueue(timer_queue); } @@ -227,7 +227,9 @@ bool OSystem_Wii::pollKeyboard(Common::Event &event) { int i; keyboard_event kbdEvent; - if (!KEYBOARD_GetEvent(&kbdEvent) > 0) + s32 res = KEYBOARD_GetEvent(&kbdEvent); + + if (!res) return false; switch (kbdEvent.type) { diff --git a/backends/platform/wii/osystem_gfx.cpp b/backends/platform/wii/osystem_gfx.cpp index bb91242f98..c7989e95ad 100644 --- a/backends/platform/wii/osystem_gfx.cpp +++ b/backends/platform/wii/osystem_gfx.cpp @@ -713,7 +713,7 @@ void OSystem_Wii::setMouseCursor(const void *buf, uint w, uint h, int hotspotX, } // nasty, shouldn't the frontend set the alpha channel? - u16 *s = (u16 *) buf; + const u16 *s = (const u16 *) buf; u16 *d = (u16 *) tmp; for (u16 y = 0; y < h; ++y) { for (u16 x = 0; x < w; ++x) { diff --git a/backends/platform/wii/osystem_sfx.cpp b/backends/platform/wii/osystem_sfx.cpp index 70a440a600..445bb2ef52 100644 --- a/backends/platform/wii/osystem_sfx.cpp +++ b/backends/platform/wii/osystem_sfx.cpp @@ -87,7 +87,7 @@ void OSystem_Wii::initSfx() { SFX_THREAD_STACKSIZE, SFX_THREAD_PRIO); if (res) { - printf("ERROR creating sfx thread: %d\n", res); + printf("ERROR creating sfx thread: %ld\n", res); LWP_CloseQueue(sfx_queue); return; } |