Merge pull request #4 from mosswg/match-to-original

Match some functions and values to the original binary
This commit is contained in:
MattKC 2023-06-11 11:17:13 -07:00 committed by GitHub
commit 363ebd2077
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 8 deletions

View file

@ -3,8 +3,7 @@
Isle *g_isle = 0; Isle *g_isle = 0;
int g_closed = 0; int g_closed = 0;
const char *WNDCLASS_NAME = "Lego Island MainNoM App"; const char *WINDOW_TITLE = "LEGO®";
const char *WINDOW_TITLE = "LEGO®";
unsigned char g_mousedown = 0; unsigned char g_mousedown = 0;
unsigned char g_mousemoved = 0; unsigned char g_mousemoved = 0;

View file

@ -5,7 +5,7 @@ class Isle;
extern Isle *g_isle; extern Isle *g_isle;
extern int g_closed; extern int g_closed;
extern const char *WNDCLASS_NAME; #define WNDCLASS_NAME "Lego Island MainNoM App"
extern const char *WINDOW_TITLE; extern const char *WINDOW_TITLE;
extern unsigned char g_mousedown; extern unsigned char g_mousedown;
extern unsigned char g_mousemoved; extern unsigned char g_mousemoved;

View file

@ -119,15 +119,17 @@ BOOL readReg(LPCSTR name, LPSTR outValue, DWORD outSize)
HKEY hKey; HKEY hKey;
DWORD valueType; DWORD valueType;
BOOL out = FALSE;
unsigned long size = outSize;
if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Mindscape\\LEGO Island", 0, KEY_READ, &hKey) == ERROR_SUCCESS) { if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Mindscape\\LEGO Island", 0, KEY_READ, &hKey) == ERROR_SUCCESS) {
if (RegQueryValueExA(hKey, name, NULL, &valueType, (LPBYTE) outValue, &outSize) == ERROR_SUCCESS) { if (RegQueryValueExA(hKey, name, NULL, &valueType, (LPBYTE) outValue, &size) == ERROR_SUCCESS) {
if (RegCloseKey(hKey) == ERROR_SUCCESS) { if (RegCloseKey(hKey) == ERROR_SUCCESS) {
return TRUE; out = TRUE;
} }
} }
} }
return FALSE; return out;
} }
int readRegBool(LPCSTR name, BOOL *out) int readRegBool(LPCSTR name, BOOL *out)
@ -234,8 +236,8 @@ void Isle::setupVideoFlags(BOOL fullScreen, BOOL flipSurfaces, BOOL backBuffers,
m_videoParam.flags().EnableBackBuffers(backBuffers); m_videoParam.flags().EnableBackBuffers(backBuffers);
m_videoParam.flags().EnableUnknown1(param_6); m_videoParam.flags().EnableUnknown1(param_6);
m_videoParam.flags().SetUnknown3(param_7); m_videoParam.flags().SetUnknown3(param_7);
m_videoParam.flags().EnableUnknown2();
m_videoParam.flags().EnableWideViewAngle(wideViewAngle); m_videoParam.flags().EnableWideViewAngle(wideViewAngle);
m_videoParam.flags().EnableUnknown2();
m_videoParam.SetDeviceName(deviceId); m_videoParam.SetDeviceName(deviceId);
if (using8bit) { if (using8bit) {
m_videoParam.flags().Set8Bit(); m_videoParam.flags().Set8Bit();

View file

@ -19,7 +19,7 @@ BOOL findExistingInstance(void)
BOOL startDirectSound(void) BOOL startDirectSound(void)
{ {
LPDIRECTSOUND lpDS; LPDIRECTSOUND lpDS = 0;
HRESULT ret = DirectSoundCreate(NULL, &lpDS, NULL); HRESULT ret = DirectSoundCreate(NULL, &lpDS, NULL);
if (ret == DS_OK && lpDS != NULL) { if (ret == DS_OK && lpDS != NULL) {
lpDS->Release(); lpDS->Release();