mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-15 20:35:13 +00:00
Code Issues Projects Releases Wiki Activity

Remove THIS macro (#1047)

Browse source 
* remove THIS

* fix

* forgot dorf
This commit is contained in:
fig02 2021-12-04 11:33:00 -05:00 • committed by GitHub
parent 68899c2e33
commit e635e34265
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
433 changed files with 1996 additions and 2859 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/code/z_fbdemo_circle.c
View file

@ -34,10 +34,8 @@ Gfx sCircleDList[] = {
gsSPEndDisplayList(),
};
#define THIS ((TransitionCircle*)thisx)
void TransitionCircle_Start(void* thisx) {
TransitionCircle* this = THIS;
TransitionCircle* this = (TransitionCircle*)thisx;
this->isDone = 0;
@ -92,7 +90,7 @@ void TransitionCircle_Start(void* thisx) {
}
void* TransitionCircle_Init(void* thisx) {
TransitionCircle* this = THIS;
TransitionCircle* this = (TransitionCircle*)thisx;
bzero(this, sizeof(*this));
return this;
@ -102,7 +100,7 @@ void TransitionCircle_Destroy(void* thisx) {
}
void TransitionCircle_Update(void* thisx, s32 updateRate) {
TransitionCircle* this = THIS;
TransitionCircle* this = (TransitionCircle*)thisx;
s32 temp_t2;
s32 temp_t3;
@ -136,7 +134,7 @@ void TransitionCircle_Update(void* thisx, s32 updateRate) {
void TransitionCircle_Draw(void* thisx, Gfx** gfxP) {
Gfx* gfx = *gfxP;
Mtx* modelView;
TransitionCircle* this = THIS;
TransitionCircle* this = (TransitionCircle*)thisx;
Gfx* texScroll;
// These variables are a best guess based on the other transition types.
f32 tPos = 0.0f;
@ -176,13 +174,13 @@ void TransitionCircle_Draw(void* thisx, Gfx** gfxP) {
}
s32 TransitionCircle_IsDone(void* thisx) {
TransitionCircle* this = THIS;
TransitionCircle* this = (TransitionCircle*)thisx;
return this->isDone;
}
void TransitionCircle_SetType(void* thisx, s32 type) {
TransitionCircle* this = THIS;
TransitionCircle* this = (TransitionCircle*)thisx;
if (type & 0x80) {
this->unk_14 = (type >> 5) & 0x1;
@ -197,13 +195,13 @@ void TransitionCircle_SetType(void* thisx, s32 type) {
}
void TransitionCircle_SetColor(void* thisx, u32 color) {
TransitionCircle* this = THIS;
TransitionCircle* this = (TransitionCircle*)thisx;
this->color.rgba = color;
}
void TransitionCircle_SetEnvColor(void* thisx, u32 envColor) {
TransitionCircle* this = THIS;
TransitionCircle* this = (TransitionCircle*)thisx;
this->envColor.rgba = envColor;
}