vrmiguel
/
sm64pc
mirror of https://github.com/sm64pc/sm64pc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix Whomp and PiranhaPlant not appearing from a distance in WF

This commit is contained in:
Heaven Volkoff 2020-05-16 02:59:29 -03:00
parent de49bf1ac2
commit aba9a57e14
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/behaviors/piranha_plant.inc.c
View File

@ -329,6 +329,7 @@ void (*TablePiranhaPlantActions[])(void) = {
void bhv_piranha_plant_loop(void) { void bhv_piranha_plant_loop(void) {
cur_obj_call_action_function(TablePiranhaPlantActions); cur_obj_call_action_function(TablePiranhaPlantActions);
#ifndef NODRAWINGDISTANCE
// In WF, hide all Piranha Plants once high enough up. // In WF, hide all Piranha Plants once high enough up.
if (gCurrLevelNum == LEVEL_WF) { if (gCurrLevelNum == LEVEL_WF) {
if (gMarioObject->oPosY > 3400.0f) if (gMarioObject->oPosY > 3400.0f)
@ -336,5 +337,6 @@ void bhv_piranha_plant_loop(void) {
else else
cur_obj_unhide(); cur_obj_unhide();
} }
#endif
o->oInteractStatus = 0; o->oInteractStatus = 0;
} }

4
src/game/behaviors/whomp.inc.c
View File

@ -246,10 +246,14 @@ void bhv_whomp_loop(void) {
cur_obj_call_action_function(sWhompActions); cur_obj_call_action_function(sWhompActions);
cur_obj_move_standard(-20); cur_obj_move_standard(-20);
if (o->oAction != 9) { if (o->oAction != 9) {
#ifndef NODRAWINGDISTANCE
// o->oBehParams2ndByte here seems to be a flag
// indicating whether this is a normal or king whomp
if (o->oBehParams2ndByte != 0) if (o->oBehParams2ndByte != 0)
cur_obj_hide_if_mario_far_away_y(2000.0f); cur_obj_hide_if_mario_far_away_y(2000.0f);
else else
cur_obj_hide_if_mario_far_away_y(1000.0f); cur_obj_hide_if_mario_far_away_y(1000.0f);
#endif
load_object_collision_model(); load_object_collision_model();
} }
} }