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

Rename RoomBehaviorType2 (#2270)

Browse source 
* Rename RoomBehavior2

* fig proposal

* fig comment
This commit is contained in:
mzxrules 2024-10-12 22:28:55 -04:00 • committed by GitHub
parent 44460eeaec
commit eee7ba9bd5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/code/z_player_lib.c
View file

@ -928,7 +928,7 @@ s32 Player_GetEnvironmentalHazard(PlayState* play) {
EnvHazardTextTriggerEntry* triggerEntry;
s32 envHazard;
if (play->roomCtx.curRoom.behaviorType2 == ROOM_BEHAVIOR_TYPE2_3) { // Room is hot
if (play->roomCtx.curRoom.environmentType == ROOM_ENV_HOT) { // Room is hot
envHazard = PLAYER_ENV_HAZARD_HOTROOM - 1;
} else if ((this->underwaterTimer > 80) &&
((this->currentBoots == PLAYER_BOOTS_IRON) || (this->underwaterTimer >= 300))) {