mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 22:30: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

23
src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c
View file

@ -8,10 +8,12 @@
#define FLAGS 0x00000000
void BgUmaJump_Init(BgUmaJump* this, GlobalContext* globalCtx);
void BgUmaJump_Destroy(BgUmaJump* this, GlobalContext* globalCtx);
void BgUmaJump_Update(BgUmaJump* this, GlobalContext* globalCtx);
void BgUmaJump_Draw(BgUmaJump* this, GlobalContext* globalCtx);
#define THIS ((BgUmaJump*)thisx)
void BgUmaJump_Init(Actor* thisx, GlobalContext* globalCtx);
void BgUmaJump_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgUmaJump_Update(Actor* thisx, GlobalContext* globalCtx);
void BgUmaJump_Draw(Actor* thisx, GlobalContext* globalCtx);
const ActorInit Bg_Umajump_InitVars = {
ACTOR_BG_UMAJUMP,
@ -32,8 +34,9 @@ static InitChainEntry initChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
void BgUmaJump_Init(BgUmaJump* this, GlobalContext* globalCtx) {
s32 pad[2];
void BgUmaJump_Init(Actor* thisx, GlobalContext* globalCtx) {
BgUmaJump* this = THIS;
s32 pad;
u32 sp24 = 0;
Actor_ProcessInitChain(&this->actor, initChain);
@ -50,13 +53,15 @@ void BgUmaJump_Init(BgUmaJump* this, GlobalContext* globalCtx) {
}
}
void BgUmaJump_Destroy(BgUmaJump* this, GlobalContext* globalCtx) {
void BgUmaJump_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgUmaJump* this = THIS;
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId);
}
void BgUmaJump_Update(BgUmaJump* this, GlobalContext* globalCtx) {
void BgUmaJump_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgUmaJump_Draw(BgUmaJump* this, GlobalContext* globalCtx) {
void BgUmaJump_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, &D_06001220);
}