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

Changes after review

Browse Source 
- Reduce scope on global strings
- Size assert for LegoGameState (based on the constructor references only)
- 1 -> TRUE for EnableFullScreenMovie
This commit is contained in:
disinvite 2023-09-29 16:29:31 -04:00
parent 0c66075f2b
commit 56d6f81d2c
6 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LEGO1/define.cpp
View File

@ -1,11 +1,5 @@
#include "define.h" #include "define.h"
// 0x100f3be8
const char *g_str_enable = "enable";
// 0x100f3bf4
const char *g_str_disable = "disable";
// 0x10101eac // 0x10101eac
const char *g_parseExtraTokens = ":;"; const char *g_parseExtraTokens = ":;";

2
LEGO1/define.h
View File

@ -1,8 +1,6 @@
#ifndef DEFINE_H #ifndef DEFINE_H
#define DEFINE_H #define DEFINE_H
extern const char *g_str_enable;
extern const char *g_str_disable;
extern const char *g_parseExtraTokens; extern const char *g_parseExtraTokens;
extern const char *g_strWORLD; extern const char *g_strWORLD;
extern const char *g_strACTION; extern const char *g_strACTION;

7
LEGO1/legofullscreenmovie.cpp
View File

@ -1,11 +1,16 @@
#include "legofullscreenmovie.h" #include "legofullscreenmovie.h"
#include "mxtypes.h" #include "mxtypes.h"
#include "legoomni.h" #include "legoomni.h"
#include "define.h"
#include "decomp.h" #include "decomp.h"
DECOMP_SIZE_ASSERT(LegoFullScreenMovie, 0x24) DECOMP_SIZE_ASSERT(LegoFullScreenMovie, 0x24)
// 0x100f3be8
const char *g_str_enable = "enable";
// 0x100f3bf4
const char *g_str_disable = "disable";
// OFFSET: LEGO1 0x1003c500 // OFFSET: LEGO1 0x1003c500
LegoFullScreenMovie::LegoFullScreenMovie(const char *p_key, const char *p_value) LegoFullScreenMovie::LegoFullScreenMovie(const char *p_key, const char *p_value)
{ {

5
LEGO1/legogamestate.cpp
View File

@ -1,5 +1,10 @@
#include "legogamestate.h" #include "legogamestate.h"
#include "legoomni.h" #include "legoomni.h"
#include "decomp.h"
// Based on the highest dword offset (0x42c) referenced in the constructor.
// There may be other members that come after.
DECOMP_SIZE_ASSERT(LegoGameState, 0x430)
// OFFSET: LEGO1 0x10039550 // OFFSET: LEGO1 0x10039550
LegoGameState::LegoGameState() LegoGameState::LegoGameState()

6
LEGO1/legogamestate.h
View File

@ -6,6 +6,7 @@
#include "legobackgroundcolor.h" #include "legobackgroundcolor.h"
#include "legofullscreenmovie.h" #include "legofullscreenmovie.h"
// SIZE 0x430 (at least)
class LegoGameState class LegoGameState
{ {
public: public:
@ -18,11 +19,12 @@ class LegoGameState
__declspec(dllexport) void SetSavePath(char *p); __declspec(dllexport) void SetSavePath(char *p);
private: private:
char *m_savePath; char *m_savePath; // 0x0
undefined m_unk[20]; undefined m_unk04[20];
LegoBackgroundColor *m_backgroundColor; // 0x18 LegoBackgroundColor *m_backgroundColor; // 0x18
LegoBackgroundColor *m_tempBackgroundColor; // 0x1c LegoBackgroundColor *m_tempBackgroundColor; // 0x1c
LegoFullScreenMovie *m_fullScreenMovie; // 0x20 LegoFullScreenMovie *m_fullScreenMovie; // 0x20
undefined m_unk24[1036];
}; };
#endif // LEGOGAMESTATE_H #endif // LEGOGAMESTATE_H

2
LEGO1/legovideomanager.cpp
View File

@ -30,7 +30,7 @@ int LegoVideoManager::DisableRMDevice()
// OFFSET: LEGO1 0x1007c300 // OFFSET: LEGO1 0x1007c300
void LegoVideoManager::EnableFullScreenMovie(MxBool p_enable) void LegoVideoManager::EnableFullScreenMovie(MxBool p_enable)
{ {
EnableFullScreenMovie(p_enable, 1); EnableFullScreenMovie(p_enable, TRUE);
} }
// OFFSET: LEGO1 0x1007c310 STUB // OFFSET: LEGO1 0x1007c310 STUB