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

20
src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c
View file

@ -8,9 +8,11 @@
#define FLAGS 0x00000000
void ObjBlockstop_Init(ObjBlockstop* this, GlobalContext* globalCtx);
void ObjBlockstop_Destroy(ObjBlockstop* this, GlobalContext* globalCtx);
void ObjBlockstop_Update(ObjBlockstop* this, GlobalContext* globalCtx);
#define THIS ((ObjBlockstop*)thisx)
void ObjBlockstop_Init(Actor* thisx, GlobalContext* globalCtx);
void ObjBlockstop_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ObjBlockstop_Update(Actor* thisx, GlobalContext* globalCtx);
const ActorInit Obj_Blockstop_InitVars = {
ACTOR_OBJ_BLOCKSTOP,
@ -24,7 +26,9 @@ const ActorInit Obj_Blockstop_InitVars = {
NULL,
};
void ObjBlockstop_Init(ObjBlockstop* this, GlobalContext* globalCtx) {
void ObjBlockstop_Init(Actor* thisx, GlobalContext* globalCtx) {
ObjBlockstop* this = THIS;
if (Flags_GetSwitch(globalCtx, this->actor.params)) {
Actor_Kill(&this->actor);
} else {
@ -32,15 +36,15 @@ void ObjBlockstop_Init(ObjBlockstop* this, GlobalContext* globalCtx) {
}
}
void ObjBlockstop_Destroy(ObjBlockstop* this, GlobalContext* globalCtx) {
void ObjBlockstop_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
void ObjBlockstop_Update(ObjBlockstop* this, GlobalContext* globalCtx) {
void ObjBlockstop_Update(Actor* thisx, GlobalContext* globalCtx) {
ObjBlockstop* this = THIS;
DynaPolyActor* dynaActor;
s32 pad;
Vec3f sp4C;
u32 sp48;
s32 pad2;
s32 pad;
if (func_8003DF10(&globalCtx->colCtx, &this->actor.initPosRot.pos, &this->actor.posRot.pos, &sp4C,
&this->actor.floorPoly, 0, 0, 1, 1, &sp48, &this->actor)) {