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

16
src/overlays/actors/ovl_En_Vase/z_en_vase.c
View file

@ -8,9 +8,11 @@
#define FLAGS 0x00000010
void EnVase_Init(EnVase* this, GlobalContext* globalCtx);
void EnVase_Destroy(EnVase* this, GlobalContext* globalCtx);
void EnVase_Draw(EnVase* this, GlobalContext* globalCtx);
#define THIS ((EnVase*)thisx)
void EnVase_Init(Actor* thisx, GlobalContext* globalCtx);
void EnVase_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnVase_Draw(Actor* thisx, GlobalContext* globalCtx);
const ActorInit En_Vase_InitVars = {
ACTOR_EN_VASE,
@ -26,15 +28,17 @@ const ActorInit En_Vase_InitVars = {
extern u32 DL_VASE;
void EnVase_Init(EnVase* this, GlobalContext* globalCtx) {
void EnVase_Init(Actor* thisx, GlobalContext* globalCtx) {
EnVase* this = THIS;
Actor_SetScale(&this->actor, 0.01f);
this->actor.posRot2.pos = this->actor.posRot.pos;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 6.0f);
}
void EnVase_Destroy(EnVase* this, GlobalContext* globalCtx) {
void EnVase_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
void EnVase_Draw(EnVase* this, GlobalContext* globalCtx) {
void EnVase_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, &DL_VASE);
}