mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-09 00:00:44 +00:00
Code Issues Projects Releases Wiki Activity

More actor cleanup Part 3 (#118)

Browse source 
* Add custom types for actor specific functions (like actions)

* Add a forward struct declaration for all other actors
This commit is contained in:
Roman971 2020-05-06 00:53:15 +02:00 • committed by GitHub
parent f114df8929
commit 1425678d8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
477 changed files with 1817 additions and 792 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_En_Ma3/z_en_ma3.c
View file

@ -277,11 +277,11 @@ void EnMa3_Init(Actor* thisx, GlobalContext* globalCtx) {
switch (func_80AA2EC8(this, globalCtx)) {
case 0:
func_80AA3004(this, 0);
this->actionFunc = (ActorFunc)func_80AA3200;
this->actionFunc = func_80AA3200;
break;
case 1:
func_80AA3004(this, 0);
this->actionFunc = (ActorFunc)func_80AA3200;
this->actionFunc = func_80AA3200;
break;
case 2:
Actor_Kill(&this->actor);

8
src/overlays/actors/ovl_En_Ma3/z_en_ma3.h
View file

@ -4,10 +4,14 @@
#include <ultra64.h>
#include <global.h>
typedef struct {
struct EnMa3;
typedef void (*EnMa3ActionFunc)(struct EnMa3*, GlobalContext*);
typedef struct EnMa3 {
/* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime;
/* 0x0190 */ ActorFunc actionFunc;
/* 0x0190 */ EnMa3ActionFunc actionFunc;
/* 0x0194 */ ColliderCylinder collider;
/* 0x01E0 */ struct_80034A14_arg1 unk_1E0;
/* 0x0208 */ s16 unk_208;