Merge remote-tracking branch 'isle/master'

This commit is contained in:
Christian Semmler 2025-10-18 10:23:53 -07:00
commit b06f05ccf9
No known key found for this signature in database
GPG Key ID: 086DAA1360BEEE5C
13 changed files with 819 additions and 473 deletions

View File

@ -324,9 +324,6 @@
// GLOBAL: ISLE 0x411850
// __cflush
// XGLOBAL ISLE 0x4125f8
// ?_pnhHeap@@3P6AHI@ZA
// GLOBAL: ISLE 0x412888
// ___setlc_active

View File

@ -25,8 +25,8 @@ class Act2Actor : public LegoAnimActor {
Act2Actor();
void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) override; // vtable+0x24
void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_updateTransform) override; // vtable+0x24
void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
// FUNCTION: LEGO1 0x1001a180
MxS32 VTable0x68(Vector3& p_v1, Vector3& p_v2, Vector3& p_v3) override

View File

@ -40,8 +40,8 @@ class LegoActor : public LegoEntity {
return !strcmp(p_name, LegoActor::ClassName()) || LegoEntity::IsA(p_name);
}
void ParseAction(char* p_extra) override; // vtable+0x20
void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) override; // vtable+0x24
void ParseAction(char* p_extra) override; // vtable+0x20
void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_updateTransform) override; // vtable+0x24
// FUNCTION: LEGO1 0x10002cc0
// FUNCTION: BETA10 0x1000f3e0

View File

@ -77,18 +77,28 @@ class LegoCarBuild : public LegoWorld {
public:
// SIZE 0x1c
struct LookupTableActions {
undefined4 m_unk0x00; // 0x00
undefined4 m_unk0x04; // 0x04
undefined4 m_unk0x08; // 0x08
undefined4 m_unk0x0c; // 0x0c
undefined4 m_unk0x10; // 0x10
undefined4 m_unk0x14; // 0x14
undefined4 m_unk0x18; // 0x18
MxU32 m_introduction0; // 0x00
MxU32 m_leaveUnfinished; // 0x04
MxU32 m_completed; // 0x08
MxU32 m_introduction1; // 0x0c
MxU32 m_introduction2; // 0x10
MxU32 m_introduction3; // 0x14
MxU32 m_shortExplanation; // 0x18
};
enum Unknown0xf8 {
c_unknownminusone = -1,
c_unknown8 = 8
enum LookupTableActionType {
e_introduction0 = 0,
e_introduction1 = 1,
e_introduction2 = 2,
e_introduction3 = 3,
e_leaveUnfinished = 4,
e_completed = 5,
e_shortExplanation = 6,
};
enum ResetPlacedSelectedPart {
c_disabled = -1,
c_enabled = 8
};
LegoCarBuild();
@ -115,15 +125,15 @@ class LegoCarBuild : public LegoWorld {
return !strcmp(p_name, LegoCarBuild::ClassName()) || LegoWorld::IsA(p_name);
}
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void ReadyWorld() override; // vtable+0x50
MxBool Escape() override; // vtable+0x64
void Enable(MxBool p_enable) override; // vtable+0x68
virtual void VTable0x6c(); // vtable+0x6c
virtual void VTable0x70(); // vtable+0x70
virtual void VTable0x74(MxFloat p_param1[2], MxFloat p_param2[3]); // vtable+0x74
virtual void VTable0x78(MxFloat p_param1[2], MxFloat p_param2[3]); // vtable+0x78
virtual void VTable0x7c(MxFloat p_param1[2], MxFloat p_param2[3]); // vtable+0x7c
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void ReadyWorld() override; // vtable+0x50
MxBool Escape() override; // vtable+0x64
void Enable(MxBool p_enable) override; // vtable+0x68
virtual void InitializeDisplayingTransform(); // vtable+0x6c
virtual void CalculateStartAndTargetScreenPositions(); // vtable+0x70
virtual void CalculateDragPositionAbove(MxFloat p_coordinates[2], MxFloat p_position[3]); // vtable+0x74
virtual void CalculateDragPositionBetween(MxFloat p_coordinates[2], MxFloat p_position[3]); // vtable+0x78
virtual void CalculateDragPositionOnGround(MxFloat p_coordinates[2], MxFloat p_position[3]); // vtable+0x7c
virtual void VTable0x80(
MxFloat p_param1[2],
MxFloat p_param2[2],
@ -134,33 +144,33 @@ class LegoCarBuild : public LegoWorld {
MxS16 GetPlacedPartCount();
void SetPlacedPartCount(MxU8 p_placedPartCount);
void InitPresenters();
void FUN_10022f00();
void FUN_10022f30();
void FUN_10023130(MxLong p_x, MxLong p_y);
void DisplaySelectedPart();
void ResetSelectedPart();
void CalculateSelectedPartMatrix(MxLong p_x, MxLong p_y);
void AddSelectedPartToBuild();
undefined4 FUN_10024250(LegoEventNotificationParam* p_param);
void FUN_100243a0();
undefined4 FUN_10024480(MxActionNotificationParam* p_param);
undefined4 SelectPartFromMousePosition(MxLong p_x, MxLong p_y);
undefined4 FUN_100246e0(MxLong p_x, MxLong p_y);
MxS32 FUN_10024850(MxLong p_x, MxLong p_y);
undefined4 FUN_10024890(MxParam* p_param);
undefined4 FUN_10024c20(MxNotificationParam* p_param);
void FUN_10024ef0();
void FUN_10024f30();
void FUN_10024f50();
void FUN_10024f70(MxBool p_enabled);
void SetPresentersEnabled(MxBool p_enabled);
void TogglePresentersEnabled();
void FUN_100250e0(MxBool p_param);
void FUN_10025350(MxS32 p_objectId);
void FUN_10025450();
void FUN_10025720(undefined4 p_param1);
void FUN_10025d10(MxS32 p_param);
MxS32 FUN_10025d70();
void FUN_10025db0(const char* p_param1, undefined4 p_param2);
void FUN_10025e40();
MxS32 FUN_10025ee0(undefined4 p_param1);
MxLong HandleKeyPress(LegoEventNotificationParam* p_param);
void InitExiting();
MxLong HandleEndAction(MxActionNotificationParam* p_param);
MxLong SelectPartFromMousePosition(MxLong p_x, MxLong p_y);
MxLong HandleButtonUp(MxLong p_x, MxLong p_y);
MxLong HandleMouseMove(MxLong p_x, MxLong p_y);
MxLong HandleControl(MxParam* p_param);
MxLong HandleType0Notification(MxNotificationParam* p_param);
void StartIntroduction();
void MoveShelves();
void RotateVehicle();
void EnableColorControlsForSelectedPart(MxBool p_enabled);
void SetColorControlsEnabled(MxBool p_enabled);
void ToggleColorControlsEnabled();
void EnableDecalForSelectedPart(MxBool p_enabled);
void SetPartColor(MxS32 p_objectId);
void CalculateStartAndTargetTransforms();
void StartActorScriptByType(MxS32 p_actionType);
void StartActorScript(MxS32 p_streamId);
MxS32 GetNextIntroduction();
void TickleControl(const char* p_controlName, MxULong p_time);
void HandleEndAnim();
MxS32 GetBuildMovieId(MxS32 p_carId);
// FUNCTION: BETA10 0x100735b0
void SetCarBuildAnimPresenter(LegoCarBuildAnimPresenter* p_animPresenter) { m_animPresenter = p_animPresenter; }
@ -169,43 +179,45 @@ class LegoCarBuild : public LegoWorld {
// LegoCarBuild::`scalar deleting destructor'
private:
// inline functions
MxU32 Beta0x10070520();
void StopActionIn0x344();
enum {
e_idle = 0,
e_returning = 3,
e_selecting = 4,
e_displaying = 5,
e_dragging = 6,
};
Unknown0xf8 m_unk0xf8; // 0xf8
MxS16 m_unk0xfc; // 0xfc
MxS32 m_unk0x100; // 0x100
undefined4 m_unk0x104; // 0x104
// inline functions
MxU32 GetLookupIndex();
void StopPlayingActorScript();
ResetPlacedSelectedPart m_resetPlacedSelectedPart; // 0xf8
MxS16 m_rotateBuild; // 0xfc
MxS32 m_clickState; // 0x100
undefined4 m_unk0x104; // 0x104
// name verified by BETA10 0x1006ebba
MxS8 m_numAnimsRun; // 0x108
MxU8 m_unk0x109; // 0x109
MxU16 m_unk0x10a; // 0x10a
Uint64 m_unk0x10c; // 0x10c
LegoROI* m_selectedPart; // 0x110
BoundingSphere m_unk0x114; // 0x114
MxMatrix m_unk0x12c; // 0x12c
undefined m_unk0x174; // 0x174
MxMatrix m_unk0x178; // 0x178
MxMatrix m_unk0x1c0; // 0x1c0
MxMatrix m_unk0x208; // 0x208
// This is likely a location in pixel space
MxS32 m_unk0x250[2]; // 0x250
LegoCarBuildAnimPresenter* m_animPresenter; // 0x258
MxQuaternionTransformer m_unk0x25c; // 0x25c
// These two are likely locations in pixel space
MxS32 m_unk0x290[2]; // 0x290
MxS32 m_unk0x298[2]; // 0x298
MxFloat m_unk0x2a0; // 0x2a0
Mx4DPointFloat m_unk0x2a4; // 0x2a4
Mx4DPointFloat m_unk0x2bc; // 0x2bc
MxBool m_selectedPartIsPlaced; // 0x2d4
MxU8 m_missclickCounter; // 0x109
MxU16 m_lastActorScript; // 0x10a
Uint64 m_lastActorScriptStartTime; // 0x10c
LegoROI* m_selectedPart; // 0x110
BoundingSphere m_targetBoundingSphere; // 0x114
MxMatrix m_originalSelectedPartTransform; // 0x12c
MxBool m_alreadyFinished; // 0x174
MxMatrix m_selectedPartStartTransform; // 0x178
MxMatrix m_displayTransform; // 0x1c0
MxMatrix m_selectedPartTargetTransform; // 0x208
MxS32 m_selectedPartStartMousePosition[2]; // 0x250
LegoCarBuildAnimPresenter* m_animPresenter; // 0x258
MxQuaternionTransformer m_draggingQuarternionTransformer; // 0x25c
MxS32 m_selectedPartStartScreenPosition[2]; // 0x290
MxS32 m_selectedPartTargetScreenPosition[2]; // 0x298
MxFloat m_normalizedDistance; // 0x2a0
Mx4DPointFloat m_selectedPartStartPosition; // 0x2a4
Mx4DPointFloat m_selectedPartTargetPosition; // 0x2bc
MxBool m_displayedPartIsPlaced; // 0x2d4
// variable names verified by BETA10 0x1006b27a
MxStillPresenter* m_ColorBook_Bitmap; // 0x2dc
@ -234,21 +246,21 @@ class LegoCarBuild : public LegoWorld {
LegoVehicleBuildState* m_buildState; // 0x32c
// variable name verified by BETA10 0x1006d742
undefined4 m_carId; // 0x330
MxS32 m_carId; // 0x330
// variable name verified by BETA10 0x1006cba7
LegoGameState::Area m_destLocation; // 0x334
MxPresenter* m_unk0x338; // 0x338
MxControlPresenter* m_unk0x33c; // 0x33c
undefined4 m_unk0x340; // 0x340
undefined4 m_unk0x344; // 0x344
MxU8 m_presentersEnabled; // 0x348
MxPresenter* m_jukeboxPresenter; // 0x338
MxControlPresenter* m_tickledControl; // 0x33c
undefined4 m_unk0x340; // 0x340
MxS32 m_playingActorScript; // 0x344
MxU8 m_presentersEnabled; // 0x348
static MxS16 g_unk0x100f11cc;
static MxFloat g_unk0x100d65a4;
static MxS16 g_lastTickleState;
static MxFloat g_selectedPartRotationAngleStepYAxis;
static MxFloat g_rotationAngleStepYAxis;
static LookupTableActions g_unk0x100d65b0[];
static LookupTableActions g_actorScripts[];
};
#endif // LEGOCARBUILD_H

View File

@ -53,10 +53,10 @@ class LegoEntity : public MxEntity {
return !strcmp(p_name, LegoEntity::ClassName()) || MxEntity::IsA(p_name);
}
virtual MxResult Create(MxDSAction& p_dsAction); // vtable+0x18
virtual void Destroy(MxBool p_fromDestructor); // vtable+0x1c
virtual void ParseAction(char* p_extra); // vtable+0x20
virtual void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2); // vtable+0x24
virtual MxResult Create(MxDSAction& p_dsAction); // vtable+0x18
virtual void Destroy(MxBool p_fromDestructor); // vtable+0x1c
virtual void ParseAction(char* p_extra); // vtable+0x20
virtual void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_updateTransform); // vtable+0x24
virtual void SetWorldTransform(
const Vector3& p_location,
const Vector3& p_direction,

View File

@ -135,9 +135,9 @@ Act2Actor::Act2Actor()
}
// FUNCTION: LEGO1 0x10018940
void Act2Actor::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2)
void Act2Actor::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_updateTransform)
{
LegoAnimActor::SetROI(p_roi, p_bool1, p_bool2);
LegoAnimActor::SetROI(p_roi, p_bool1, p_updateTransform);
m_roi->SetVisibility(FALSE);
}

File diff suppressed because it is too large Load Diff

View File

@ -129,7 +129,7 @@ const char* LegoActor::GetActorName(MxU8 p_id)
// FUNCTION: LEGO1 0x1002d670
// FUNCTION: BETA10 0x1003d65f
void LegoActor::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2)
void LegoActor::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_updateTransform)
{
if (p_roi) {
const char* name = p_roi->GetName();
@ -143,7 +143,7 @@ void LegoActor::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2)
}
}
LegoEntity::SetROI(p_roi, p_bool1, p_bool2);
LegoEntity::SetROI(p_roi, p_bool1, p_updateTransform);
}
// FUNCTION: LEGO1 0x1002d6e0

View File

@ -127,12 +127,12 @@ void LegoEntity::SetWorld()
// FUNCTION: LEGO1 0x100108a0
// FUNCTION: BETA10 0x1007e724
void LegoEntity::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2)
void LegoEntity::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_updateTransform)
{
m_roi = p_roi;
if (m_roi != NULL) {
if (p_bool2) {
if (p_updateTransform) {
MxMatrix mat;
CalcLocalTransform(
Mx3DPointFloat(m_worldLocation[0], m_worldLocation[1], m_worldLocation[2]),

View File

@ -9,12 +9,6 @@
// LIBRARY: LEGO1 0x10086260
// ??3@YAXPAX@Z
// LIBRARY: LEGO1 0x1008a090
// _malloc
// LIBRARY: LEGO1 0x1008a100
// _calloc
// LIBRARY: LEGO1 0x1008a1c0
// _free
@ -937,8 +931,31 @@
// GLOBAL: LEGO1 0x100db6e0
// GUID_SysKeyboard
// Cannot be handled right now due to anonymous pointer in struct
// GLOBAL: LEGO1 0x100dd1c0
// IID_IDirect3DRM2
// LIBRARY: LEGO1 0x1008c960
// ?_query_new_handler@@YAP6AHI@ZXZ
// LIBRARY: LEGO1 0x1008c970
// ?_query_new_mode@@YAHXZ
// GLOBAL: LEGO1 0x100fd8ec
// __newmode
// Cannot be handled right now due to anonymous pointer in struct.
// We can annotate it on the original side, but we have no symbol on the recomp side.
// We would need a way of annotating "the pointer at c_dfDIKeyboard+0x14 has orig address 0x10097f80".
// // GLOBAL: LEGO1 0x10098f80
// c_dfDIKeyboard
/// Globals from libraries without symbols
// STRING: LEGO1 0x100dabb0
static const char* ___crtLCMapStringA_str = "\0";
// STRING: LEGO1 0x100dabb4
static const wchar_t *___crtLCMapStringA_wstr = L"\0";
#endif

312
LEGO1/library_smartheap.h Normal file
View File

@ -0,0 +1,312 @@
#if 0
// LIBRARY: LEGO1 0x100861d0
// ?shi_New@@YAPAXKIPAU_SHI_Pool@@@Z
// LIBRARY: LEGO1 0x10086270
// _MemInitDefaultPool@0
// LIBRARY: LEGO1 0x100862e0
// _shi_call_new_handler_msc
// LIBRARY: LEGO1 0x10086310
// _MemPoolShrink@4
// LIBRARY: LEGO1 0x10086440
// _MemPoolPreAllocate@12
// LIBRARY: LEGO1 0x100865c0
// @_shi_initPageHeaders@4
// LIBRARY: LEGO1 0x10086830
// @shi_allocPageHeader@4
// LIBRARY: LEGO1 0x10086860
// @shi_freePageHeader@8
// LIBRARY: LEGO1 0x10086a10
// @_shi_deletePage@8
// LIBRARY: LEGO1 0x10086af0
// @_shi_allocExternal@12
// LIBRARY: LEGO1 0x10086d10
// @_shi_initPageVariable@8
// LIBRARY: LEGO1 0x10086dc0
// _MemAllocPtr@12
// LIBRARY: LEGO1 0x10087020
// @_shi_allocVar@12
// LIBRARY: LEGO1 0x100871b0
// @_shi_allocBlock@12
// LIBRARY: LEGO1 0x10087380
// _MemFreePtr@4
// LIBRARY: LEGO1 0x10087430
// @_shi_freeVar@4
// LIBRARY: LEGO1 0x10087520
// _MemReAllocPtr@12
// LIBRARY: LEGO1 0x10087670
// @_shi_resizeAny@16
// LIBRARY: LEGO1 0x10087910
// @_shi_resizeVar@8
// LIBRARY: LEGO1 0x10087ae0
// _MemSizePtr@4
// LIBRARY: LEGO1 0x10087b90
// @shi_findAllocAddress@4
// LIBRARY: LEGO1 0x10087bd0
// @_shi_sysAlloc@8
// LIBRARY: LEGO1 0x10087c60
// @_shi_sysFree@4
// LIBRARY: LEGO1 0x10087cc0
// @_shi_sysRealloc@12
// LIBRARY: LEGO1 0x10087d70
// @_shi_sysResize@12
// LIBRARY: LEGO1 0x10087e50
// @_shi_sysSize@4
// LIBRARY: LEGO1 0x10087e90
// @_shi_sysAllocNear@4
// LIBRARY: LEGO1 0x10087eb0
// @_shi_sysFreeNear@4
// LIBRARY: LEGO1 0x10087ed0
// @_shi_sysValidatePtr@12
// LIBRARY: LEGO1 0x10087fd0
// @_shi_sysValidateFunction@4
// LIBRARY: LEGO1 0x100885c0
// @_shi_sysAllocPool@12
// LIBRARY: LEGO1 0x100887e0
// @_shi_sysResizePool@16
// LIBRARY: LEGO1 0x10088950
// @_shi_sysFreePage@4
// LIBRARY: LEGO1 0x10088a70
// @_shi_sysSizePage@4
// LIBRARY: LEGO1 0x10088aa0
// @_shi_sysSizePool@8
// LIBRARY: LEGO1 0x10088ac0
// @_shi_registerShared@16
// LIBRARY: LEGO1 0x10088cc0
// @_shi_unregisterShared@8
// LIBRARY: LEGO1 0x10088de0
// @_shi_getNextPool@4
// LIBRARY: LEGO1 0x10088df0
// @shi_delNextPool@4
// LIBRARY: LEGO1 0x10088ff0
// @shi_createAndEnterMutexShr@12
// LIBRARY: LEGO1 0x100890e0
// @shi_termPoolMutexShr@4
// LIBRARY: LEGO1 0x10089100
// @shi_enterPoolMutexShr@4
// LIBRARY: LEGO1 0x10089120
// @shi_leavePoolMutexShr@4
// LIBRARY: LEGO1 0x10089140
// __shi_enterCriticalSection@0
// LIBRARY: LEGO1 0x10089160
// __shi_leaveCriticalSection@0
// LIBRARY: LEGO1 0x10089180
// __shi_createAndEnterMutex
// LIBRARY: LEGO1 0x100891b0
// _shi_enterPoolMutexSafely
// LIBRARY: LEGO1 0x10089290
// _shi_enterPoolInitMutexReader
// LIBRARY: LEGO1 0x10089320
// _shi_leavePoolInitMutexReader
// LIBRARY: LEGO1 0x10089350
// _shi_enterPoolInitMutexWriter
// LIBRARY: LEGO1 0x10089420
// _shi_leavePoolInitMutexWriter
// LIBRARY: LEGO1 0x10089440
// _shi_isNT
// LIBRARY: LEGO1 0x10089470
// _MemPoolInit@4
// LIBRARY: LEGO1 0x100897e0
// _MemPoolSetPageSize@8
// LIBRARY: LEGO1 0x100898f0
// _MemPoolSetBlockSizeFS@8
// LIBRARY: LEGO1 0x100899d0
// @_shi_poolFree@8
// LIBRARY: LEGO1 0x10089b80
// @_shi_invokeErrorHandler1@8
// LIBRARY: LEGO1 0x10089ea0
// _MemErrorUnwind@0
// LIBRARY: LEGO1 0x10089ef0
// _MemDefaultErrorHandler@4
// LIBRARY: LEGO1 0x10089f70
// @_shi_taskRemovePool@4
// LIBRARY: LEGO1 0x1008a010
// @_shi_getCurrentThreadContext@8
// LIBRARY: LEGO1 0x1008a070
// @_shi_deleteThreadContext@8
// LIBRARY: LEGO1 0x1008a090
// _malloc
// LIBRARY: LEGO1 0x1008a100
// _calloc
// LIBRARY: LEGO1 0x1008a160
// _realloc
// LIBRARY: LEGO1 0x1008a1d0
// __expand
// LIBRARY: LEGO1 0x1008a210
// __heapadd
// LIBRARY: LEGO1 0x1008a220
// __heapwalk
// LIBRARY: LEGO1 0x1008a2b0
// __heapused
// LIBRARY: LEGO1 0x1008a2e0
// __heapmin
// LIBRARY: LEGO1 0x1008a300
// __msize
// LIBRARY: LEGO1 0x1008a310
// __heapchk
// LIBRARY: LEGO1 0x1008a340
// __heapset
// LIBRARY: LEGO1 0x1008a350
// @_shi_sysReportError@16
// LIBRARY: LEGO1 0x1008a3d0
// _MemPoolSize@4
// LIBRARY: LEGO1 0x1008a460
// _MemPoolWalk@8
// LIBRARY: LEGO1 0x1008a500
// @_shi_walkPool@16
// LIBRARY: LEGO1 0x1008a800
// @shi_isBlockInUseSmall@8
// LIBRARY: LEGO1 0x1008aac0
// @_shi_isBlockInUseFS@12
// LIBRARY: LEGO1 0x1008ab40
// _MemPoolCheck@4
// LIBRARY: LEGO1 0x1008ade0
// _MemCheckPtr@8
// GLOBAL: LEGO1 0x100da970
// _szLibName
// GLOBAL: LEGO1 0x100fc528
// ?_new_handler@@3P6AXXZA
// GLOBAL: LEGO1 0x100fc530
// _MemDefaultPool
// GLOBAL: LEGO1 0x100fc54c
// __shi_compactPoolFn
// GLOBAL: LEGO1 0x100fc550
// __shi_compactPageFn
// GLOBAL: LEGO1 0x100fc554
// _MemDefaultPoolFlags
// GLOBAL: LEGO1 0x100fc55c
// __shi_mutexGlobalInit
// GLOBAL: LEGO1 0x100fc560
// __shi_mutexMovInit
// GLOBAL: LEGO1 0x100fc564
// __shi_mutexMovLockCount
// GLOBAL: LEGO1 0x100fc568
// _shi_initPoolReaders
// GLOBAL: LEGO1 0x100fc56c
// _shi_eventInitPool
// GLOBAL: LEGO1 0x100fc570
// _shi_mutexMovShr
// GLOBAL: LEGO1 0x100fc598
// _shi_deferFreePools
// GLOBAL: LEGO1 0x100fc5a8
// __shi_poolTerminating
// GLOBAL: LEGO1 0x100fc5ac
// _MemDefaultPoolBlockSizeFS
// GLOBAL: LEGO1 0x100fc5b0
// _MemDefaultPoolPageSize
// GLOBAL: LEGO1 0x100fc5b4
// _SmartHeap_malloc
// GLOBAL: LEGO1 0x100fc7e0
// __shi_TaskRecord
// GLOBAL: LEGO1 0x10109368
// ?_pnhHeap@@3P6AHI@ZA
// GLOBAL: LEGO1 0x101095a0
// __shi_mutexMov
// GLOBAL: LEGO1 0x101095c0
// _shi_mutexPoolSynch
// GLOBAL: LEGO1 0x101095e0
// __shi_mutexGlobal
#endif

View File

@ -13,7 +13,7 @@
DECOMP_SIZE_ASSERT(MxSoundManager, 0x3c);
// GLOBAL LEGO1 0x10101420
// GLOBAL: LEGO1 0x10101420
MxS32 g_volumeAttenuation[100] = {-6643, -5643, -5058, -4643, -4321, -4058, -3836, -3643, -3473, -3321, -3184, -3058,
-2943, -2836, -2736, -2643, -2556, -2473, -2395, -2321, -2251, -2184, -2120, -2058,
-2000, -1943, -1888, -1836, -1785, -1736, -1689, -1643, -1599, -1556, -1514, -1473,

View File

@ -88,8 +88,7 @@ inline Result RendererCreateDevice(
if (Succeeded(result)) {
if (rCreateData.m_pBackBuffer) {
// LEGO1 0x10101040
// GLOBAL: BETA10 0x102055f4
// annotated below
static int g_setBufferCount = 1;
if (g_setBufferCount) {
Result result2 = ResultVal(rpDevice->SetBufferCount(2));
@ -101,6 +100,10 @@ inline Result RendererCreateDevice(
return result;
}
// GLOBAL: LEGO1 0x10101040
// GLOBAL: BETA10 0x102055f4
// ?g_setBufferCount@?3??RendererCreateDevice@@YA?AW4Result@Tgl@@PAUIDirect3DRM2@@ABUDeviceDirectDrawCreateData@3@AAPAUIDirect3DRMDevice2@@@Z@4HA
// FUNCTION: BETA10 0x1016cf40
inline Result RendererImpl::CreateDevice(const DeviceDirectDrawCreateData& rCreateData, DeviceImpl& rDevice)
{