isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-24 08:41:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into ncc

Browse Source
This commit is contained in:
Christian Semmler 2023-12-12 04:32:36 -05:00
commit 7fac20616b
35 changed files with 267 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/format.yml vendored
View File

@ -17,6 +17,7 @@ jobs:
--style=file \
ISLE/*.cpp ISLE/*.h \
LEGO1/*.cpp LEGO1/*.h \
LEGO1/mxstl/*.h \
LEGO1/realtime/*.cpp LEGO1/realtime/*.h \
LEGO1/tgl/*.h \
LEGO1/tgl/d3drm/*.cpp LEGO1/tgl/d3drm/*.h \

4
CMakeLists.txt
View File

@ -230,6 +230,8 @@ if (MINGW)
endif()
# Additional include directories
target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/util")
target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/3rdparty/vec")
target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/flic")
target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/smk")
@ -264,6 +266,8 @@ if (ISLE_BUILD_APP)
ISLE/define.cpp
)
target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/util")
# Include LEGO1 headers in ISLE
target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1")

1
CONTRIBUTING.md
View File

@ -27,6 +27,7 @@ This repository currently has only one goal: accuracy to the original executable
* [`ISLE`](/ISLE): Decompilation of `ISLE.EXE`. It depends on some code in `LEGO1`.
* [`LEGO1`](/LEGO1): Decompilation of `LEGO1.DLL`. This folder contains code from Mindscape's custom in-house engine called **Omni** (file pattern: `mx*`), the LEGO Island-specific extensions for Omni and the game's code (file pattern: `lego*`) as well as several utility libraries developed by Mindscape.
* [`tools`](/tools): A set of tools aiding in the decompilation effort.
* [`util`](/util): Utility headers aiding in the decompilation effort.
## Tooling

74
ISLE/isleapp.cpp
View File

@ -24,6 +24,10 @@
#include <dsound.h>
// Might be static functions of IsleApp
BOOL FindExistingInstance(void);
BOOL StartDirectSound(void);
// FUNCTION: ISLE 0x401000
IsleApp::IsleApp()
{
@ -169,9 +173,6 @@ void IsleApp::SetupVideoFlags(
}
}
BOOL FindExistingInstance(void);
BOOL StartDirectSound(void);
// FUNCTION: ISLE 0x401610
int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd)
{
@ -389,52 +390,46 @@ LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
}
return DefWindowProcA(hWnd, uMsg, wParam, lParam);
case WM_DISPLAYCHANGE:
if (g_isle && VideoManager() && g_isle->m_fullScreen && VideoManager()->GetDirect3D() &&
VideoManager()->GetDirect3D()->GetDeviceModeFinder()) {
int targetWidth = LOWORD(lParam);
int targetHeight = HIWORD(lParam);
int targetDepth = wParam;
if (g_isle && VideoManager() && g_isle->m_fullScreen && VideoManager()->GetDirect3D()) {
if (VideoManager()->GetDirect3D()->GetDeviceModeFinder()) {
int targetDepth = wParam;
int targetWidth = LOWORD(lParam);
int targetHeight = HIWORD(lParam);
if (g_waitingForTargetDepth) {
g_waitingForTargetDepth = 0;
g_targetDepth = targetDepth;
}
else {
BOOL valid = FALSE;
if (targetWidth == g_targetWidth && targetHeight == g_targetHeight && g_targetDepth == targetDepth) {
valid = TRUE;
if (g_waitingForTargetDepth) {
g_waitingForTargetDepth = 0;
g_targetDepth = targetDepth;
}
else {
BOOL valid = FALSE;
if (g_rmDisabled) {
if (valid) {
g_reqEnableRMDevice = 1;
if (g_targetWidth == targetWidth && g_targetHeight == targetHeight &&
g_targetDepth == targetDepth) {
valid = TRUE;
}
if (g_rmDisabled) {
if (valid) {
g_reqEnableRMDevice = 1;
}
}
else if (!valid) {
g_rmDisabled = 1;
Lego()->StartTimer();
VideoManager()->DisableRMDevice();
}
}
else if (!valid) {
g_rmDisabled = 1;
Lego()->StartTimer();
VideoManager()->DisableRMDevice();
}
}
}
return DefWindowProcA(hWnd, uMsg, wParam, lParam);
case WM_SETCURSOR:
if (g_isle) {
HCURSOR hCursor = g_isle->m_cursorCurrent;
if (hCursor == g_isle->m_cursorBusy || hCursor == g_isle->m_cursorNo || !hCursor) {
SetCursor(hCursor);
return 0;
}
}
break;
case WM_KEYDOWN:
// While this probably should be (HIWORD(lParam) & KF_REPEAT), this seems
// to be what the assembly is actually doing
if (lParam & (KF_REPEAT << 16)) {
return DefWindowProcA(hWnd, uMsg, wParam, lParam);
}
keyCode = wParam;
type = c_notificationKeyPress;
keyCode = wParam;
break;
case WM_MOUSEMOVE:
g_mousemoved = 1;
@ -457,6 +452,13 @@ LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
return 0;
}
break;
case WM_SETCURSOR:
if (g_isle && (g_isle->m_cursorCurrent == g_isle->m_cursorBusy ||
g_isle->m_cursorCurrent == g_isle->m_cursorNo || !g_isle->m_cursorCurrent)) {
SetCursor(g_isle->m_cursorCurrent);
return 0;
}
break;
default:
return DefWindowProcA(hWnd, uMsg, wParam, lParam);
}
@ -812,10 +814,8 @@ inline void IsleApp::Tick(BOOL sleepIfNotNextFrame)
}
this->m_gameStarted = 1;
}
return;
}
if (sleepIfNotNextFrame != 0)
else if (sleepIfNotNextFrame != 0)
Sleep(0);
}

2
LEGO1/mxatomidcounter.h
View File

@ -1,7 +1,7 @@
#ifndef MXATOMIDCOUNTER_H
#define MXATOMIDCOUNTER_H
#include "compat.h" // STL
#include "mxstl/stlcompat.h"
#include "mxstring.h"
// Counts the number of existing MxAtomId objects based

2
LEGO1/mxbackgroundaudiomanager.cpp
View File

@ -244,7 +244,7 @@ MxResult MxBackgroundAudioManager::PlayMusic(MxDSAction& p_action, undefined4 p_
m_action2.SetAtomId(p_action.GetAtomId());
m_action2.SetObjectId(p_action.GetObjectId());
m_action2.SetUnknown84(this);
m_action2.SetUnknown8c(this);
m_action2.SetOrigin(this);
MxResult result = Start(&m_action2);

99
LEGO1/mxcompositepresenter.cpp
View File

@ -1,7 +1,11 @@
#include "mxcompositepresenter.h"
#include "decomp.h"
#include "mxactionnotificationparam.h"
#include "mxautolocker.h"
#include "mxdsmultiaction.h"
#include "mxnotificationmanager.h"
#include "mxobjectfactory.h"
DECOMP_SIZE_ASSERT(MxCompositePresenter, 0x4c);
@ -13,6 +17,9 @@ MxBool MxCompositePresenter::VTable0x64(undefined4 p_unknown)
return TRUE;
}
// TEMPLATE: LEGO1 0x1004ae90
// list<MxPresenter *,allocator<MxPresenter *> >::_Buynode
// FUNCTION: LEGO1 0x100b60b0
MxCompositePresenter::MxCompositePresenter()
{
@ -43,34 +50,106 @@ MxCompositePresenter::~MxCompositePresenter()
NotificationManager()->Unregister(this);
}
// STUB: LEGO1 0x100b6410
MxResult MxCompositePresenter::StartAction(MxStreamController*, MxDSAction*)
// FUNCTION: LEGO1 0x100b6410
MxResult MxCompositePresenter::StartAction(MxStreamController* p_controller, MxDSAction* p_action)
{
// TODO
return SUCCESS;
MxAutoLocker lock(&m_criticalSection);
MxResult result = FAILURE;
MxDSActionList* actions = ((MxDSMultiAction*) p_action)->GetActionList();
MxObjectFactory* factory = ObjectFactory();
MxDSActionListCursor cursor(actions);
MxDSAction* action;
if (MxPresenter::StartAction(p_controller, p_action) == SUCCESS) {
// The usual cursor.Next() loop doesn't match here, even though
// the logic is the same. It does match when "deconstructed" into
// the following Head(), Current() and NextFragment() calls,
// but this seems unlikely to be the original code.
// The alpha debug build also uses Next().
cursor.Head();
while (cursor.Current(action)) {
cursor.NextFragment();
MxBool success = FALSE;
action->CopyFlags(m_action->GetFlags());
const char* presenterName = PresenterNameDispatch(*action);
MxPresenter* presenter = (MxPresenter*) factory->Create(presenterName);
if (presenter && presenter->AddToManager() == SUCCESS) {
presenter->SetCompositePresenter(this);
if (presenter->StartAction(p_controller, action) == SUCCESS)
success = TRUE;
}
if (success) {
action->SetOrigin(this);
m_list.push_back(presenter);
}
else if (presenter)
delete presenter;
}
result = SUCCESS;
}
return result;
}
// STUB: LEGO1 0x100b65e0
// FUNCTION: LEGO1 0x100b65e0
void MxCompositePresenter::EndAction()
{
// TODO
MxAutoLocker lock(&m_criticalSection);
if (!m_action)
return;
((MxDSMultiAction*) m_action)->GetActionList()->DeleteAll(FALSE);
while (!m_list.empty()) {
MxPresenter* presenter = m_list.front();
m_list.pop_front();
presenter->SetCompositePresenter(NULL);
presenter->EndAction();
}
MxDSAction* action = m_action;
MxPresenter::EndAction();
if (action && action->GetOrigin()) {
NotificationManager()->Send(
action->GetOrigin(),
&MxEndActionNotificationParam(c_notificationEndAction, this, action, FALSE)
);
}
}
// STUB: LEGO1 0x100b6760
// FUNCTION: LEGO1 0x100b6760
MxLong MxCompositePresenter::Notify(MxParam& p)
{
// TODO
MxAutoLocker lock(&m_criticalSection);
switch (((MxNotificationParam&) p).GetNotification()) {
case c_notificationEndAction:
VTable0x58(p);
break;
case MXPRESENTER_NOTIFICATION:
VTable0x5c(p);
}
return 0;
}
// STUB: LEGO1 0x100b67f0
void MxCompositePresenter::VTable0x58()
void MxCompositePresenter::VTable0x58(MxParam& p)
{
// TODO
}
// STUB: LEGO1 0x100b69b0
void MxCompositePresenter::VTable0x5c()
void MxCompositePresenter::VTable0x5c(MxParam& p)
{
// TODO
}

20
LEGO1/mxcompositepresenter.h
View File

@ -1,8 +1,8 @@
#ifndef MXCOMPOSITEPRESENTER_H
#define MXCOMPOSITEPRESENTER_H
#include "compat.h" // STL
#include "mxpresenter.h"
#include "mxstl/stlcompat.h"
class MxCompositePresenterList : public list<MxPresenter*> {};
@ -26,15 +26,15 @@ class MxCompositePresenter : public MxPresenter {
return !strcmp(name, MxCompositePresenter::ClassName()) || MxPresenter::IsA(name);
}
virtual MxResult StartAction(MxStreamController*, MxDSAction*) override; // vtable+0x3c
virtual void EndAction() override; // vtable+0x40
virtual void SetTickleState(TickleState p_tickleState) override; // vtable+0x44
virtual MxBool HasTickleStatePassed(TickleState p_tickleState) override; // vtable+0x48
virtual void Enable(MxBool p_enable) override; // vtable+0x54
virtual void VTable0x58(); // vtable+0x58
virtual void VTable0x5c(); // vtable+0x5c
virtual void VTable0x60(MxPresenter* p_presenter); // vtable+0x60
virtual MxBool VTable0x64(undefined4 p_unknown); // vtable+0x64
virtual MxResult StartAction(MxStreamController*, MxDSAction* p_action) override; // vtable+0x3c
virtual void EndAction() override; // vtable+0x40
virtual void SetTickleState(TickleState p_tickleState) override; // vtable+0x44
virtual MxBool HasTickleStatePassed(TickleState p_tickleState) override; // vtable+0x48
virtual void Enable(MxBool p_enable) override; // vtable+0x54
virtual void VTable0x58(MxParam& p); // vtable+0x58
virtual void VTable0x5c(MxParam& p); // vtable+0x5c
virtual void VTable0x60(MxPresenter* p_presenter); // vtable+0x60
virtual MxBool VTable0x64(undefined4 p_unknown); // vtable+0x64
private:
MxCompositePresenterList m_list; // 0x40

2
LEGO1/mxdiskstreamcontroller.h
View File

@ -1,9 +1,9 @@
#ifndef MXDISKSTREAMCONTROLLER_H
#define MXDISKSTREAMCONTROLLER_H
#include "compat.h" // STL
#include "decomp.h"
#include "mxdsbuffer.h"
#include "mxstl/stlcompat.h"
#include "mxstreamcontroller.h"
#include "mxtypes.h"

4
LEGO1/mxdsaction.cpp
View File

@ -28,7 +28,7 @@ MxDSAction::MxDSAction()
this->m_up.Fill(FLT_MAX);
this->m_unk84 = NULL;
this->m_unk88 = 0;
this->m_unk8c = NULL;
this->m_origin = NULL;
this->m_unkTimingField = INT_MIN;
}
@ -84,7 +84,7 @@ void MxDSAction::CopyFrom(MxDSAction& p_dsAction)
AppendData(p_dsAction.m_extraLength, p_dsAction.m_extraData);
this->m_unk84 = p_dsAction.m_unk84;
this->m_unk88 = p_dsAction.m_unk88;
this->m_unk8c = p_dsAction.m_unk8c;
this->m_origin = p_dsAction.m_origin;
this->m_unkTimingField = p_dsAction.m_unkTimingField;
}

14
LEGO1/mxdsaction.h
View File

@ -64,12 +64,20 @@ class MxDSAction : public MxDSObject {
inline void SetLoopCount(MxS32 p_loopCount) { m_loopCount = p_loopCount; }
inline const Vector3Data& GetLocation() const { return m_location; }
inline void SetUnknown84(MxCore* p_unk84) { m_unk84 = p_unk84; }
inline MxCore* GetUnknown8c() { return m_unk8c; }
inline void SetUnknown8c(MxCore* p_unk8c) { m_unk8c = p_unk8c; }
inline MxCore* GetOrigin() { return m_origin; }
inline void SetOrigin(MxCore* p_origin) { m_origin = p_origin; }
inline MxBool IsLooping() const { return m_flags & Flag_Looping; }
inline MxBool IsBit3() const { return m_flags & Flag_Bit3; }
inline void CopyFlags(MxU32 p_flags)
{
if (p_flags & MxDSAction::Flag_Looping)
SetFlags(GetFlags() | MxDSAction::Flag_Looping);
else if (p_flags & MxDSAction::Flag_Bit3)
SetFlags(GetFlags() | MxDSAction::Flag_Bit3);
}
protected:
MxU32 m_sizeOnDisk; // 0x2c
MxU32 m_flags; // 0x30
@ -83,7 +91,7 @@ class MxDSAction : public MxDSObject {
MxU16 m_extraLength; // 0x80
MxCore* m_unk84; // 0x84
undefined4 m_unk88; // 0x88
MxCore* m_unk8c; // 0x8c
MxCore* m_origin; // 0x8c
MxLong m_unkTimingField; // 0x90
};

6
LEGO1/mxdsmultiaction.h
View File

@ -36,9 +36,11 @@ class MxDSMultiAction : public MxDSAction {
virtual MxBool HasId(MxU32 p_objectId) override; // vtable+34;
virtual void SetUnkTimingField(MxLong p_unkTimingField) override; // vtable+38;
inline MxDSActionList* GetActionList() const { return m_actions; };
protected:
MxU32 m_sizeOnDisk;
MxDSActionList* m_actions;
MxU32 m_sizeOnDisk; // 0x94
MxDSActionList* m_actions; // 0x98
};
#endif // MXDSMULTIACTION_H

10
LEGO1/mxdsobject.h
View File

@ -37,18 +37,16 @@ class MxDSObject : public MxCore {
virtual void Deserialize(char** p_source, MxS16 p_unk24); // vtable+1c;
inline virtual void SetAtomId(MxAtomId p_atomId) { this->m_atomId = p_atomId; } // vtable+20;
inline const MxAtomId& GetAtomId() { return this->m_atomId; }
inline MxDSType GetType() const { return (MxDSType) this->m_type; }
inline const char* GetSourceName() const { return this->m_sourceName; }
inline MxU32 GetObjectId() { return this->m_objectId; }
inline const MxAtomId& GetAtomId() { return this->m_atomId; }
inline MxS16 GetUnknown24() { return this->m_unk24; }
inline void SetType(MxDSType p_type) { this->m_type = p_type; }
inline void SetObjectId(MxU32 p_objectId) { this->m_objectId = p_objectId; }
inline void SetUnknown24(MxS16 p_unk24) { this->m_unk24 = p_unk24; }
inline const char* GetSourceName() const { return this->m_sourceName; }
inline void SetType(MxDSType p_type) { this->m_type = p_type; }
inline MxDSType GetType() const { return (MxDSType) this->m_type; }
private:
MxU32 m_sizeOnDisk; // 0x8
MxU16 m_type; // 0xc

16
LEGO1/mxlist.h
View File

@ -60,7 +60,7 @@ class MxList : protected MxCollection<T> {
virtual ~MxList() override;
void Append(T p_obj) { _InsertEntry(p_obj, this->m_last, NULL); };
void DeleteAll();
void DeleteAll(MxBool p_destroy = TRUE);
MxU32 GetCount() { return this->m_count; }
void SetDestroy(void (*p_customDestructor)(T)) { this->m_customDestructor = p_customDestructor; }
@ -95,6 +95,13 @@ class MxListCursor : public MxCore {
void Reset() { m_match = NULL; }
void Prepend(T p_newobj);
// TODO: Probably shouldn't exist
void NextFragment()
{
if (m_match)
m_match = m_match->GetNext();
}
private:
MxList<T>* m_list;
MxListEntry<T>* m_match;
@ -113,14 +120,17 @@ MxList<T>::~MxList()
}
template <class T>
inline void MxList<T>::DeleteAll()
inline void MxList<T>::DeleteAll(MxBool p_destroy)
{
for (MxListEntry<T>* t = m_first;;) {
if (!t)
break;
MxListEntry<T>* next = t->GetNext();
this->m_customDestructor(t->GetValue());
if (p_destroy)
this->m_customDestructor(t->GetValue());
delete t;
t = next;
}

4
LEGO1/mxmediapresenter.cpp
View File

@ -170,9 +170,9 @@ void MxMediaPresenter::EndAction()
m_subscriber = NULL;
}
if (action && action->GetUnknown8c()) {
if (action && action->GetOrigin()) {
NotificationManager()->Send(
action->GetUnknown8c(),
action->GetOrigin(),
&MxEndActionNotificationParam(c_notificationEndAction, this, action, FALSE)
);
}

2
LEGO1/mxnotificationmanager.h
View File

@ -1,10 +1,10 @@
#ifndef MXNOTIFICATIONMANAGER_H
#define MXNOTIFICATIONMANAGER_H
#include "compat.h"
#include "mxcore.h"
#include "mxcriticalsection.h"
#include "mxnotificationparam.h"
#include "mxstl/stlcompat.h"
#include "mxtypes.h"
class MxNotification {

2
LEGO1/mxpresenter.cpp
View File

@ -195,7 +195,7 @@ void MxPresenter::SendToCompositePresenter(MxOmni* p_omni)
NotificationManager()->Send(m_compositePresenter, &MxNotificationParam(MXPRESENTER_NOTIFICATION, this));
m_action->SetUnknown8c(p_omni ? p_omni : MxOmni::GetInstance());
m_action->SetOrigin(p_omni ? p_omni : MxOmni::GetInstance());
m_compositePresenter = NULL;
}
}

5
LEGO1/mxpresenter.h
View File

@ -74,6 +74,11 @@ class MxPresenter : public MxCore {
inline MxS32 GetDisplayZ() const { return this->m_displayZ; }
inline MxDSAction* GetAction() const { return this->m_action; }
inline void SetCompositePresenter(MxCompositePresenter* p_compositePresenter)
{
m_compositePresenter = p_compositePresenter;
}
protected:
__declspec(dllexport) void Init();
void SendToCompositePresenter(MxOmni*);

16
LEGO1/mxramstreamcontroller.cpp
View File

@ -42,11 +42,19 @@ MxResult MxRAMStreamController::vtable0x20(MxDSAction* p_action)
return FAILURE;
}
// STUB: LEGO1 0x100c6320
MxResult MxRAMStreamController::vtable0x24(undefined4 p_unknown)
// FUNCTION: LEGO1 0x100c6320
MxResult MxRAMStreamController::vtable0x24(MxDSAction* p_action)
{
// TODO STUB
return FAILURE;
MxDSAction action;
do {
if (m_action0x60 != NULL) {
delete m_action0x60;
m_action0x60 = NULL;
}
action = *p_action;
MxStreamController::vtable0x24(&action);
} while (m_action0x60 != NULL);
return SUCCESS;
}
// STUB: LEGO1 0x100d0d80

2
LEGO1/mxramstreamcontroller.h
View File

@ -26,7 +26,7 @@ class MxRAMStreamController : public MxStreamController {
virtual MxResult Open(const char* p_filename) override;
virtual MxResult vtable0x20(MxDSAction* p_action) override;
virtual MxResult vtable0x24(undefined4 p_unknown) override;
virtual MxResult vtable0x24(MxDSAction* p_action) override;
private:
MxDSBuffer m_buffer;

0
LEGO1/mxstl.h → LEGO1/mxstl/mxstl.h
View File

18
LEGO1/mxstl/stlcompat.h Normal file
View File

@ -0,0 +1,18 @@
#ifndef STLCOMPAT_H
#define STLCOMPAT_H
#include "compat.h"
#if defined(_MSC_VER) && _MSC_VER <= MSVC420_VERSION
// Disable "nonstandard extension used : 'bool'" warning spam
#pragma warning(disable : 4237)
#include "mxstl.h"
#else
#include <algorithm>
#include <list>
#include <set>
using std::list;
using std::set;
#endif
#endif // STLCOMPAT_H

37
LEGO1/mxstreamcontroller.cpp
View File

@ -117,11 +117,20 @@ MxResult MxStreamController::vtable0x20(MxDSAction* p_action)
return result;
}
// STUB: LEGO1 0x100c1740
MxResult MxStreamController::vtable0x24(undefined4 p_unknown)
// FUNCTION: LEGO1 0x100c1740
MxResult MxStreamController::vtable0x24(MxDSAction* p_action)
{
// TODO STUB
return FAILURE;
MxAutoLocker locker(&m_criticalSection);
vtable0x30(p_action);
m_action0x60 = m_unkList0x54.Find(p_action, TRUE);
if (m_action0x60 == NULL) {
return FAILURE;
}
else {
p_action->SetUnknown24(m_action0x60->GetUnknown24());
p_action->SetObjectId(m_action0x60->GetObjectId());
return FUN_100c1f00(m_action0x60);
}
}
// FUNCTION: LEGO1 0x100c1800
@ -153,9 +162,25 @@ MxResult MxStreamController::vtable0x2c(MxDSAction* p_action, MxU32 p_bufferval)
return FUN_100c1800(p_action, (p_bufferval / m_provider->GetFileSize()) * m_provider->GetFileSize());
}
// STUB: LEGO1 0x100c1ce0
MxResult MxStreamController::vtable0x30(undefined4 p_unknown)
// FUNCTION: LEGO1 0x100c1ce0
MxResult MxStreamController::vtable0x30(MxDSAction* p_unknown)
{
MxAutoLocker locker(&m_criticalSection);
MxResult result = FAILURE;
MxDSAction* action = m_unkList0x3c.Find(p_unknown, TRUE);
if (action != NULL) {
MxNextActionDataStart* data = m_nextActionList.Find(action->GetObjectId(), action->GetUnknown24());
delete action;
delete data;
result = SUCCESS;
}
return result;
}
// STUB: LEGO1 0x100c1f00
MxResult MxStreamController::FUN_100c1f00(MxDSAction* p_action)
{
// TODO
return FAILURE;
}

7
LEGO1/mxstreamcontroller.h
View File

@ -1,13 +1,13 @@
#ifndef MXSTREAMCONTROLLER_H
#define MXSTREAMCONTROLLER_H
#include "compat.h" // STL
#include "decomp.h"
#include "mxatomid.h"
#include "mxcore.h"
#include "mxcriticalsection.h"
#include "mxdsaction.h"
#include "mxdsobject.h"
#include "mxstl/stlcompat.h"
#include "mxstreamlist.h"
#include "mxstreamprovider.h"
@ -36,14 +36,15 @@ class MxStreamController : public MxCore {
virtual MxResult vtable0x18(undefined4 p_unknown, undefined4 p_unknown2); // vtable+0x18
virtual MxResult vtable0x1C(undefined4 p_unknown, undefined4 p_unknown2); // vtable+0x1c
virtual MxResult vtable0x20(MxDSAction* p_action); // vtable+0x20
virtual MxResult vtable0x24(undefined4 p_unknown); // vtable+0x24
virtual MxResult vtable0x24(MxDSAction* p_unknown); // vtable+0x24
MxResult FUN_100c1800(MxDSAction* p_action, MxU32 p_val);
virtual MxResult vtable0x28(); // vtable+0x28
virtual MxResult vtable0x2c(MxDSAction* p_action, MxU32 p_bufferval); // vtable+0x2c
virtual MxResult vtable0x30(undefined4 p_unknown); // vtable+0x30
virtual MxResult vtable0x30(MxDSAction* p_unknown); // vtable+0x30
MxBool FUN_100c20d0(MxDSObject& p_obj);
MxResult FUN_100c1a00(MxDSAction* p_action, MxU32 p_bufferval);
MxResult FUN_100c1f00(MxDSAction* p_action);
inline MxAtomId& GetAtom() { return atom; };

2
LEGO1/mxstreamlist.h
View File

@ -1,10 +1,10 @@
#ifndef MXSTREAMLIST_H
#define MXSTREAMLIST_H
#include "compat.h" // STL
#include "mxdsaction.h"
#include "mxdssubscriber.h"
#include "mxnextactiondatastart.h"
#include "mxstl/stlcompat.h"
template <class T>
class MxStreamList : public list<T> {};

2
LEGO1/mxticklemanager.h
View File

@ -1,8 +1,8 @@
#ifndef MXTICKLEMANAGER_H
#define MXTICKLEMANAGER_H
#include "compat.h"
#include "mxcore.h"
#include "mxstl/stlcompat.h"
#include "mxtypes.h"
class MxTickleClient {

2
LEGO1/realtime/matrix.cpp
View File

@ -1,7 +1,7 @@
#include "matrix.h"
#include "../decomp.h"
#include "decomp.h"
#include "math.h"
#include <memory.h>

2
LEGO1/realtime/orientableroi.cpp
View File

@ -1,6 +1,6 @@
#include "orientableroi.h"
#include "../decomp.h"
#include "decomp.h"
DECOMP_SIZE_ASSERT(OrientableROI, 0xdc)

4
LEGO1/realtime/roi.h
View File

@ -3,9 +3,9 @@
// ROI stands for Real-time Object Instance.
#include "../compat.h"
#include "../mxstl.h"
#include "../mxstl/stlcompat.h"
#include "../realtime/realtime.h"
#include "compat.h"
#include "lodlist.h"
#include "vector.h"

2
LEGO1/realtime/vector.cpp
View File

@ -1,7 +1,7 @@
#include "vector.h"
#include "../decomp.h"
#include "decomp.h"
#include <math.h>
#include <memory.h>

2
LEGO1/tgl/d3drm/impl.h
View File

@ -1,6 +1,6 @@
#include "../../decomp.h"
#include "../tgl.h"
#include "decomp.h"
#include <d3drm.h>

2
LEGO1/viewmanager/viewlodlist.h
View File

@ -1,9 +1,9 @@
#ifndef VIEWLODLIST_H
#define VIEWLODLIST_H
#include "../compat.h"
#include "../realtime/lodlist.h"
#include "assert.h"
#include "compat.h"
#pragma warning(disable : 4786)

2
LEGO1/viewmanager/viewroi.cpp
View File

@ -1,6 +1,6 @@
#include "viewroi.h"
#include "../decomp.h"
#include "decomp.h"
DECOMP_SIZE_ASSERT(ViewROI, 0xe0)

20
LEGO1/compat.h → util/compat.h
View File

@ -1,5 +1,5 @@
#ifndef ISLECOMPAT_H
#define ISLECOMPAT_H
#ifndef COMPAT_H
#define COMPAT_H
// Various macros to enable compiling with other/newer compilers.
@ -11,9 +11,6 @@
#define COMPAT_CONST
#endif
// DIsable "nonstandard extension used : 'bool'" warning spam
#pragma warning(disable : 4237)
// Disable "identifier was truncated to '255' characters" warning.
// Impossible to avoid this if using STL map or set.
// This removes most (but not all) occurrences of the warning.
@ -21,17 +18,6 @@
#define MSVC420_VERSION 1020
// STL compatibility.
#if defined(_MSC_VER) && _MSC_VER <= MSVC420_VERSION
#include "mxstl.h"
#else
#include <algorithm>
#include <list>
#include <set>
using std::list;
using std::set;
#endif
// We use `override` so newer compilers can tell us our vtables are valid,
// however this keyword was added in C++11, so we define it as empty for
// compatibility with older compilers.
@ -39,4 +25,4 @@ using std::set;
#define override
#endif
#endif // ISLECOMPAT_H
#endif // COMPAT_H

0
LEGO1/decomp.h → util/decomp.h
View File