mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-07 14:50:15 +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

34
src/overlays/actors/ovl_En_Ms/z_en_ms.c
View file

@ -8,15 +8,18 @@
#define FLAGS 0x00000009
#define THIS ((EnMs*)thisx)
void EnMs_Init(Actor* thisx, GlobalContext* globalCtx);
void EnMs_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnMs_Update(Actor* thisx, GlobalContext* globalCtx);
void EnMs_Draw(Actor* thisx, GlobalContext* globalCtx);
void EnMs_SetOfferText(EnMs* this, GlobalContext* globalCtx);
void EnMs_Init(EnMs* this, GlobalContext* globalCtx);
void EnMs_Destroy(EnMs* this, GlobalContext* globalCtx);
void EnMs_Wait(EnMs* this, GlobalContext* globalCtx);
void EnMs_Talk(EnMs* this, GlobalContext* globalCtx);
void EnMs_Sell(EnMs* this, GlobalContext* globalCtx);
void EnMs_TalkAfterBuy(EnMs* this, GlobalContext* globalCtx);
void EnMs_Update(EnMs* this, GlobalContext* globalCtx);
void EnMs_Draw(EnMs* this, GlobalContext* globalCtx);
const ActorInit En_Ms_InitVars = {
ACTOR_EN_MS,
@ -63,9 +66,9 @@ void EnMs_SetOfferText(EnMs* this, GlobalContext* globalCtx) {
}
}
void EnMs_Init(EnMs* this, GlobalContext* globalCtx) {
s32 pad1;
s32 pad2;
void EnMs_Init(Actor* thisx, GlobalContext* globalCtx) {
EnMs* this = THIS;
s32 pad;
if (LINK_AGE_IN_YEARS != YEARS_CHILD) {
Actor_Kill(&this->actor);
@ -89,9 +92,10 @@ void EnMs_Init(EnMs* this, GlobalContext* globalCtx) {
this->actionFunc = EnMs_Wait;
}
void EnMs_Destroy(EnMs* this, GlobalContext* globalCtx) {
ColliderCylinder* collider = &this->collider;
Collider_DestroyCylinder(globalCtx, collider);
void EnMs_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnMs* this = THIS;
Collider_DestroyCylinder(globalCtx, &this->collider);
}
void EnMs_Wait(EnMs* this, GlobalContext* globalCtx) {
@ -155,9 +159,9 @@ void EnMs_TalkAfterBuy(EnMs* this, GlobalContext* globalCtx) {
}
}
void EnMs_Update(EnMs* this, GlobalContext* globalCtx) {
s32 pad1;
s32 pad2;
void EnMs_Update(Actor* thisx, GlobalContext* globalCtx) {
EnMs* this = THIS;
s32 pad;
this->activeTimer += 1;
Actor_SetHeight(&this->actor, 20.0f);
@ -175,7 +179,9 @@ void EnMs_Update(EnMs* this, GlobalContext* globalCtx) {
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider);
}
void EnMs_Draw(EnMs* this, GlobalContext* globalCtx) {
void EnMs_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnMs* this = THIS;
func_80093D18(globalCtx->state.gfxCtx);
SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, NULL,
NULL, &this->actor);