mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-24 16:01:26 +00:00
Code Issues Projects Releases Wiki Activity

PlayState Rename (#1231)

Browse source 
* global context -> play

* fix PlayState* PlayState
This commit is contained in:
fig02 2022-05-21 14:23:43 -04:00 • committed by GitHub
parent 154f44b6da
commit 2e6279bc8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
912 changed files with 40489 additions and 41078 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/overlays/actors/ovl_En_It/z_en_it.c
View file

@ -8,9 +8,9 @@
#define FLAGS 0
void EnIt_Init(Actor* thisx, GlobalContext* globalCtx);
void EnIt_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnIt_Update(Actor* thisx, GlobalContext* globalCtx);
void EnIt_Init(Actor* thisx, PlayState* play);
void EnIt_Destroy(Actor* thisx, PlayState* play);
void EnIt_Update(Actor* thisx, PlayState* play);
static ColliderCylinderInit sCylinderInit = {
{
@ -46,25 +46,25 @@ const ActorInit En_It_InitVars = {
(ActorFunc)NULL,
};
void EnIt_Init(Actor* thisx, GlobalContext* globalCtx) {
void EnIt_Init(Actor* thisx, PlayState* play) {
EnIt* this = (EnIt*)thisx;
this->actor.params = 0x0D05;
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
Collider_InitCylinder(play, &this->collider);
Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo2(&this->actor.colChkInfo, 0, &sColChkInfoInit);
}
void EnIt_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void EnIt_Destroy(Actor* thisx, PlayState* play) {
EnIt* this = (EnIt*)thisx;
Collider_DestroyCylinder(globalCtx, &this->collider);
Collider_DestroyCylinder(play, &this->collider);
}
void EnIt_Update(Actor* thisx, GlobalContext* globalCtx) {
void EnIt_Update(Actor* thisx, PlayState* play) {
EnIt* this = (EnIt*)thisx;
s32 pad;
Collider_UpdateCylinder(&this->actor, &this->collider);
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base);
}