mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-07-11 05:44:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match func_802B0570 and fix BananaActor (#204)

Browse Source 
I misunderstood how unions worked. In order to accomplish the
 original goal, the 3 named s16's need to be in a struct instead
 of just floating around.

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
This commit is contained in:
Tyler McGavran
2022-05-18 03:45:46 -04:00
committed by GitHub
parent b1c0c05bd3
commit 63c4f48340
3 changed files with 23 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/actor_types.h
+2
View File
@@ -295,9 +295,11 @@ struct BananaActor {
/* 0x0C */ f32 boundingBoxSize;
union {
/* 0x10 */ Vec3s rot;
struct {
/* 0x10 */ s16 playerId; // Id of the player that owns this banana
/* 0x12 */ s16 elderIndex; // Index in gActorList of the next-oldest banana in the bunch
/* 0x14 */ s16 youngerIndex; // Index in gActorList of the next-youngest banana in the bunch
};
};
/* 0x16 */ s16 unk_16;
/* 0x18 */ Vec3f pos;