diff options
| author | MegaMech <MegaMech@users.noreply.github.com> | 2024-11-14 23:32:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-14 23:32:55 -0700 |
| commit | 475f167bb2803999c5116bc285601d1f9a05d7de (patch) | |
| tree | 859fec292c5c9807cc9690ebf4f0600f558b6063 /src/engine/Actor.h | |
| parent | 4fbb031dd95f2a84e73fbca269f517e98808d293 (diff) | |
[modding] Big Update PR (#118)
* Implement kart vehicle
* Fix menu CC
* Actors
* variable framerate
* Implement Actors vector
* Fix water & scrolling textures
* Finish ACoin
* Refactor finishline
* Refactor mtx to vector
* Fix refactored screen code bugs
* Fix playlist bug
* Switching courses working now
* Fix podium ceremony
* Mostly Fix Demo and Credits
* Credits Load Actors and Textures
* Fix credits
* Formatting
* Update lus and torch
* Fix water features
* Fix crabs
* Combine function
* Fix wheels
* Add Moon Jump Cheat
* Wheel Change
* Fix smoke due to wheel change
* Fix screens for wheels
* Fix transparency
* Fix staff ghost
* Fix lakitu transition widescreen
* Rename and export credits text
* Fixes
---------
Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>
Diffstat (limited to 'src/engine/Actor.h')
| -rw-r--r-- | src/engine/Actor.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/engine/Actor.h b/src/engine/Actor.h index 53b5cfa4d..88f5b34a0 100644 --- a/src/engine/Actor.h +++ b/src/engine/Actor.h @@ -7,13 +7,12 @@ extern "C" { #include "main.h" #include "camera.h" #include "common_structs.h" -} + class AActor { public: - uint8_t uuid[16]; - /* 0x00 */ s16 Type; + /* 0x00 */ s16 Type = 0; /* 0x02 */ s16 Flags; /* 0x04 */ s16 Unk_04; /* 0x06 */ s16 State; @@ -24,6 +23,7 @@ public: /* 0x18 */ Vec3f Pos; /* 0x24 */ Vec3f Velocity = {0, 0, 0}; /* 0x30 */ Collision Unk30; + uint8_t uuid[16]; virtual ~AActor() = default; // Virtual destructor for proper cleanup in derived classes @@ -31,6 +31,9 @@ public: virtual void Tick(); virtual void Draw(Camera*); - virtual void Collision(); + virtual void Collision(Player* player, AActor* actor); virtual void Destroy(); + virtual bool IsMod(); }; + +}
\ No newline at end of file |