diff options
| author | MegaMech <MegaMech@users.noreply.github.com> | 2024-10-15 13:09:43 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-15 13:09:43 -0600 |
| commit | a0862b6a159373f2e1554e489ecb5bb08d89654e (patch) | |
| tree | b5c33fc7f65b438ee74898dd9ed7ba25b0fa108a /include | |
| parent | 58d56fcba848e8545052c1d85ef27d0b02841538 (diff) | |
[modding] Implement Vehicles & Fix Animations (#109)
* Train works
* Fix minimap
* Fix highway
* Fix
* Refactor train and boat
* Update
* Implement Trucks
* Fix tanker
* Finish implementing vehicles
* Fix animations
* Fix spawn players
* Fix spawn players
* Fix loading custom data
---------
Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/actor_types.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/actor_types.h b/include/actor_types.h index 9c41a2e0d..387aa285e 100644 --- a/include/actor_types.h +++ b/include/actor_types.h @@ -4,6 +4,7 @@ #include <libultraship.h> #include <macros.h> #include <common_structs.h> +#include <assert.h> // #pragma GCC diagnostic push // #pragma GCC diagnostic ignored "-Wmicrosoft-extension" @@ -159,9 +160,8 @@ struct RailroadCrossing { /* 0x00 */ s16 type; /* 0x02 */ s16 flags; /* 0x04 */ s16 someTimer; - /* 0x06 */ s16 crossingId; - /* 0x08 */ f32 unk_08; - /* 0x0C */ f32 unk_0C; + /* 0x06 */ s16 crossingId; // unused now + /* 0x08 */ void* crossingTrigger; // Crossing Trigger Class /* 0x10 */ Vec3s rot; /* 0x16 */ s16 unk_16; /* 0x18 */ Vec3f pos; @@ -169,6 +169,9 @@ struct RailroadCrossing { /* 0x30 */ Collision unk30; }; // size = 0x70 +// crossingTrigger might ruin struct size when compiled on 32 bit +static_assert(sizeof(struct RailroadCrossing) == sizeof(struct Actor), "RailroadCrossing struct size does not match base struct size"); + struct FallingRock { /* 0x00 */ s16 type; /* 0x02 */ s16 flags; |