mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 06:52:03 +00:00
Code Issues Projects Releases Wiki Activity

Fix many missing NULLs (#1389)

Browse source 
* Fix many missing NULLs

* Fix a raw actor id in en_horse
This commit is contained in:
Roman971 2022-10-04 07:18:50 +02:00 • committed by GitHub
parent 78e528d6fb
commit 2f4c25da53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 66 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
View file

@ -453,7 +453,7 @@ void EnRu1_SpawnSplash(EnRu1* this, PlayState* play) {
pos.y = this->actor.world.pos.y + this->actor.yDistToWater;
pos.z = this->actor.world.pos.z;
EffectSsGSplash_Spawn(play, &pos, 0, 0, 1, 0);
EffectSsGSplash_Spawn(play, &pos, NULL, NULL, 1, 0);
}
void func_80AEB6E0(EnRu1* this, PlayState* play) {
@ -1601,7 +1601,7 @@ s32 func_80AEE6D0(EnRu1* this, PlayState* play) {
s32 pad;
s8 curRoomNum = play->roomCtx.curRoom.num;
if (!GET_INFTABLE(INFTABLE_144) && (func_80AEB124(play) != 0)) {
if (!GET_INFTABLE(INFTABLE_144) && (func_80AEB124(play) != NULL)) {
if (!Player_InCsMode(play)) {
Animation_Change(&this->skelAnime, &gRutoChildSeesSapphireAnim, 1.0f, 0,
Animation_GetLastFrame(&gRutoChildSquirmAnim), ANIMMODE_LOOP, -8.0f);
@ -2361,7 +2361,7 @@ void EnRu1_DrawXlu(EnRu1* this, PlayState* play) {
void EnRu1_Draw(Actor* thisx, PlayState* play) {
EnRu1* this = (EnRu1*)thisx;
if (this->drawConfig < 0 || this->drawConfig >= ARRAY_COUNT(sDrawFuncs) || sDrawFuncs[this->drawConfig] == 0) {
if (this->drawConfig < 0 || this->drawConfig >= ARRAY_COUNT(sDrawFuncs) || sDrawFuncs[this->drawConfig] == NULL) {
// "Draw mode is improper!"
osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
return;