mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 00:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement/match Pizza::PlayAction (#1123)

Browse Source 
* Implement/match Pizza::PlayAction

* Remove unused header
This commit is contained in:
Christian Semmler
2024-10-28 09:25:54 -07:00
committed by GitHub
parent 2fa2ab4a96
commit ad353b7f3e
6 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
LEGO1/lego/legoomni/include/legoanimationmanager.h
View File

@@ -1,7 +1,6 @@
#ifndef LEGOANIMATIONMANAGER_H
#define LEGOANIMATIONMANAGER_H
#include "actionsfwd.h"
#include "decomp.h"
#include "legolocations.h"
#include "legostate.h"
@@ -161,7 +160,7 @@ public:
void FUN_10060570(MxBool p_unk0x1a);
MxResult StartEntityAction(MxDSAction& p_dsAction, LegoEntity* p_entity);
MxResult FUN_10060dc0(
IsleScript::Script p_objectId,
MxU32 p_objectId,
MxMatrix* p_matrix,
MxBool p_param3,
MxBool p_param4,

10
LEGO1/lego/legoomni/include/pizza.h
View File

@@ -132,7 +132,7 @@ public:
MxResult Serialize(LegoFile* p_file) override; // vtable+0x1c
// FUNCTION: BETA10 0x100ef470
void SetUnknown0xb0(undefined4 p_unk0xb0) { m_unk0xb0 = p_unk0xb0; }
void SetUnknown0xb0(MxU32 p_unk0xb0) { m_unk0xb0 = p_unk0xb0; }
MxS16 GetHighScore(MxU8 p_actorId) { return GetMission(p_actorId)->m_hiScore; }
@@ -145,7 +145,7 @@ public:
PizzeriaState* m_pizzeriaState; // 0x08
undefined4 m_unk0x0c; // 0x0c
Mission m_missions[5]; // 0x10
undefined4 m_unk0xb0; // 0xb0
MxU32 m_unk0xb0; // 0xb0
};
// VTABLE: LEGO1 0x100d7380
@@ -176,10 +176,10 @@ public:
MxLong HandlePathStruct(LegoPathStructNotificationParam& p_param) override; // vtable+0x80
void CreateState();
void FUN_10038220(MxU32 p_objectId);
void FUN_10038220(IsleScript::Script p_objectId);
void FUN_100382b0();
void StopActions();
void PlayAction(MxU32 p_objectId, MxBool);
void PlayAction(MxU32 p_objectId, MxBool p_param7);
void SetSkateboard(SkateBoard* p_skateBoard) { m_skateBoard = p_skateBoard; }
@@ -191,7 +191,7 @@ private:
PizzaMissionState::Mission* m_mission; // 0x80
SkateBoard* m_skateBoard; // 0x84
Act1State* m_act1state; // 0x88
undefined4 m_unk0x8c; // 0x8c
IsleScript::Script m_unk0x8c; // 0x8c
MxLong m_unk0x90; // 0x90
undefined4 m_unk0x94; // 0x94
MxBool m_unk0x98; // 0x98