isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-02-03 12:31:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix naming

Browse Source
This commit is contained in:
Christian Semmler 2024-12-27 10:36:05 -07:00
parent 888676ab12
commit 61cecea089
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ISLE/isleapp.cpp
View File

@ -389,7 +389,7 @@ SDL_AppResult SDL_AppEvent(void* appstate, SDL_Event* event)
break; break;
} }
if (event->user.type == g_LegoSdlEvents.windows_message) { if (event->user.type == g_legoSdlEvents.m_windowsMessage) {
switch (event->user.code) { switch (event->user.code) {
case WM_ISLE_SETCURSOR: case WM_ISLE_SETCURSOR:
g_isle->SetupCursor((Cursor) (uintptr_t) event->user.data1); g_isle->SetupCursor((Cursor) (uintptr_t) event->user.data1);

2
LEGO1/lego/legoomni/include/legomain.h
View File

@ -191,7 +191,7 @@ class LegoOmni : public MxOmni {
void CloseMainWindow() void CloseMainWindow()
{ {
SDL_Event event; SDL_Event event;
event.user.type = g_LegoSdlEvents.windows_message; event.user.type = g_legoSdlEvents.m_windowsMessage;
event.user.code = WM_CLOSE; event.user.code = WM_CLOSE;
event.user.data1 = NULL; event.user.data1 = NULL;
event.user.data2 = NULL; event.user.data2 = NULL;

4
LEGO1/lego/legoomni/include/legoutils.h
View File

@ -16,10 +16,10 @@
#define DS_NOT_A_STREAM -1 #define DS_NOT_A_STREAM -1
struct LegoSdlEvents { struct LegoSdlEvents {
Uint32 windows_message; Uint32 m_windowsMessage;
}; };
LEGO1_EXPORT extern LegoSdlEvents g_LegoSdlEvents; LEGO1_EXPORT extern LegoSdlEvents g_legoSdlEvents;
enum Cursor { enum Cursor {
e_cursorArrow = 0, e_cursorArrow = 0,

13
LEGO1/lego/legoomni/src/common/legoutils.cpp
View File

@ -37,7 +37,7 @@
#include <string.h> #include <string.h>
#include <vec.h> #include <vec.h>
LegoSdlEvents g_LegoSdlEvents; LegoSdlEvents g_legoSdlEvents;
// FUNCTION: LEGO1 0x1003dd70 // FUNCTION: LEGO1 0x1003dd70
// FUNCTION: BETA10 0x100d3410 // FUNCTION: BETA10 0x100d3410
@ -569,11 +569,12 @@ void EnableAnimations(MxBool p_enable)
void InitSdlEvents() void InitSdlEvents()
{ {
static bool initialized = false; static bool g_initialized = false;
if (!initialized) {
initialized = true; if (!g_initialized) {
g_initialized = true;
Uint32 event = SDL_RegisterEvents(1); Uint32 event = SDL_RegisterEvents(1);
g_LegoSdlEvents.windows_message = event + 0; g_legoSdlEvents.m_windowsMessage = event + 0;
} }
} }
@ -581,7 +582,7 @@ void InitSdlEvents()
void SetAppCursor(Cursor p_cursor) void SetAppCursor(Cursor p_cursor)
{ {
SDL_Event event; SDL_Event event;
event.user.type = g_LegoSdlEvents.windows_message; event.user.type = g_legoSdlEvents.m_windowsMessage;
event.user.code = WM_ISLE_SETCURSOR; event.user.code = WM_ISLE_SETCURSOR;
event.user.data1 = (void*) p_cursor; event.user.data1 = (void*) p_cursor;
SDL_PushEvent(&event); SDL_PushEvent(&event);

4
LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
View File

@ -516,9 +516,9 @@ MxBool LegoInputManager::FUN_1005cdf0(LegoEventNotificationParam& p_param)
static Uint32 SDLCALL LegoInputManagerTimerCallback(void* userdata, SDL_TimerID timerID, Uint32 interval) static Uint32 SDLCALL LegoInputManagerTimerCallback(void* userdata, SDL_TimerID timerID, Uint32 interval)
{ {
LegoInputManager* input_manager = (LegoInputManager*) userdata; LegoInputManager* inputManager = (LegoInputManager*) userdata;
SDL_Event event; SDL_Event event;
event.type = g_LegoSdlEvents.windows_message; event.type = g_legoSdlEvents.m_windowsMessage;
event.user.code = WM_TIMER; event.user.code = WM_TIMER;
event.user.data1 = (void*) (uintptr_t) timerID; event.user.data1 = (void*) (uintptr_t) timerID;
event.user.data2 = NULL; event.user.data2 = NULL;