isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2024-11-22 23:48:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix pizza constructor (#149)

Browse source 
* Pizza: fix type of m_unk98

* Fix pizza constructor

* Match Pizza::Pizza

* Use undefined type

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:
Joshua Peisach 2023-09-30 19:25:33 -04:00 committed by GitHub
parent b20aa9b8fb
commit 7f423439b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
LEGO1/legoactor.cpp
View file

@ -1,3 +1,8 @@
#include "legoactor.h" #include "legoactor.h"
DECOMP_SIZE_ASSERT(LegoActor, 0x78) DECOMP_SIZE_ASSERT(LegoActor, 0x78)
// OFFSET: LEGO1 0x1002d110 STUB
LegoActor::LegoActor()
{
}

2
LEGO1/legoactor.h
View file

@ -9,6 +9,8 @@
class LegoActor : public LegoEntity class LegoActor : public LegoEntity
{ {
public: public:
LegoActor();
// OFFSET: LEGO1 0x1002d210 // OFFSET: LEGO1 0x1002d210
inline virtual const char *ClassName() const override // vtable+0x0c inline virtual const char *ClassName() const override // vtable+0x0c
{ {

4
LEGO1/pizza.cpp
View file

@ -1,13 +1,11 @@
#include "pizza.h" #include "pizza.h"
#include "decomp.h"
DECOMP_SIZE_ASSERT(Pizza, 0x9c); DECOMP_SIZE_ASSERT(Pizza, 0x9c);
// OFFSET: LEGO1 0x10037ef0 // OFFSET: LEGO1 0x10037ef0
Pizza::Pizza() Pizza::Pizza()
{ {
// FIXME: This inherits from LegoActor, probably why this isn't matching this->m_unk7c = 0;
this->m_unk80 = 0; this->m_unk80 = 0;
this->m_unk84 = 0; this->m_unk84 = 0;
this->m_unk88 = 0; this->m_unk88 = 0;

21
LEGO1/pizza.h
View file

@ -1,6 +1,8 @@
#ifndef PIZZA_H #ifndef PIZZA_H
#define PIZZA_H #define PIZZA_H
#include "decomp.h"
#include "isleactor.h" #include "isleactor.h"
#include "mxcore.h" #include "mxcore.h"
#include "mxomni.h" #include "mxomni.h"
@ -29,16 +31,17 @@ class Pizza : public IsleActor
{ {
return !strcmp(name, Pizza::ClassName()) || IsleActor::IsA(name); return !strcmp(name, Pizza::ClassName()) || IsleActor::IsA(name);
} }
private: private:
MxS32 m_unk78; undefined4 m_unk78;
MxS32 m_unk7c; undefined4 m_unk7c;
MxS32 m_unk80; undefined4 m_unk80;
MxS32 m_unk84; undefined4 m_unk84;
MxS32 m_unk88; undefined4 m_unk88;
MxS32 m_unk8c; undefined4 m_unk8c;
MxU32 m_unk90; undefined4 m_unk90;
MxS32 m_unk94; undefined4 m_unk94;
MxS32 m_unk98; undefined m_unk98;
}; };
#endif // PIZZA_H #endif // PIZZA_H