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

More actor cleanup Part 2 (#116)

Browse source 
* Change all main actor functions to take a 'Actor* thisx' argument

* Change all actor callbacks to also take a 'Actor* thisx' argument
This commit is contained in:
Roman971 2020-05-04 21:02:51 +02:00 • committed by GitHub
parent 8efddb0fe0
commit f114df8929
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
429 changed files with 3689 additions and 2523 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
View file

@ -10,10 +10,12 @@
#define FLAGS 0x02000010
void ArrowLight_Init(ArrowLight* this, GlobalContext* globalCtx);
void ArrowLight_Destroy(ArrowLight* this, GlobalContext* globalCtx);
void ArrowLight_Update(ArrowLight* this, GlobalContext* globalCtx);
void ArrowLight_Draw(ArrowLight* this, GlobalContext* globalCtx);
#define THIS ((ArrowLight*)thisx)
void ArrowLight_Init(Actor* thisx, GlobalContext* globalCtx);
void ArrowLight_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ArrowLight_Update(Actor* thisx, GlobalContext* globalCtx);
void ArrowLight_Draw(Actor* thisx, GlobalContext* globalCtx);
void ArrowLight_Charge(ArrowLight* this, GlobalContext* globalCtx);
void ArrowLight_Fly(ArrowLight* this, GlobalContext* globalCtx);
@ -41,7 +43,9 @@ void ArrowLight_SetupAction(ArrowLight* this, ActorFunc* actionFunc) {
this->actionFunc = actionFunc;
}
void ArrowLight_Init(ArrowLight* this, GlobalContext* globalCtx) {
void ArrowLight_Init(Actor* thisx, GlobalContext* globalCtx) {
ArrowLight* this = THIS;
Actor_ProcessInitChain(&this->actor, initChain);
this->radius = 0;
this->unk_160 = 1.0f;
@ -52,7 +56,7 @@ void ArrowLight_Init(ArrowLight* this, GlobalContext* globalCtx) {
this->unk_164 = 0.0f;
}
void ArrowLight_Destroy(ArrowLight* this, GlobalContext* globalCtx) {
void ArrowLight_Destroy(Actor* thisx, GlobalContext* globalCtx) {
func_800876C8(globalCtx);
// Translates to: "Disappearance"
LOG_STRING("消滅", "../z_arrow_light.c", 403);
@ -177,7 +181,9 @@ void ArrowLight_Fly(ArrowLight* this, GlobalContext* globalCtx) {
}
}
void ArrowLight_Update(ArrowLight* this, GlobalContext* globalCtx) {
void ArrowLight_Update(Actor* thisx, GlobalContext* globalCtx) {
ArrowLight* this = THIS;
if (globalCtx->msgCtx.msgMode == 0xD || globalCtx->msgCtx.msgMode == 0x11) {
Actor_Kill(&this->actor);
} else {
@ -185,9 +191,9 @@ void ArrowLight_Update(ArrowLight* this, GlobalContext* globalCtx) {
}
}
void ArrowLight_Draw(ArrowLight* this, GlobalContext* globalCtx) {
s32 pad1;
s32 pad2;
void ArrowLight_Draw(Actor* thisx, GlobalContext* globalCtx) {
ArrowLight* this = THIS;
s32 pad;
u32 stateFrames;
GraphicsContext* gfxCtx;
Actor* tranform;