diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2023-07-04 23:52:36 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-04 09:52:36 -0400 |
| commit | 857a0cfdaf29755b763eda075b7ac9c4a204b0e4 (patch) | |
| tree | c99fa0ca56fb72b0919d9fa33d724f8f19f1cf77 /src/code/z_fireobj.c | |
| parent | 0f572acbda00bb46cf0079ea851ef1d2fa17290b (diff) | |
`item_name_static` documented and `ItemId` updates (#1304)
* WIP
* map static
* finish english names
* jpn
* revert map name
* name prefix
* boss to big
* more comments
* item enums
* more items
* more
* PR Suggestions
* PR Suggestion
Diffstat (limited to 'src/code/z_fireobj.c')
| -rw-r--r-- | src/code/z_fireobj.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/code/z_fireobj.c b/src/code/z_fireobj.c index 98d14874b..9c69fb6a0 100644 --- a/src/code/z_fireobj.c +++ b/src/code/z_fireobj.c @@ -112,7 +112,7 @@ void FireObj_UpdateStateTransitions(PlayState* play, FireObj* fire) { (waterY - fire->position.y > 6500.0f * fire->yScale)) { FireObj_SetState(fire, fire->dynamicSizeStep, FIRE_STATE_NOT_LIT); } - if ((fire->flags & FIRE_FLAG_INTERACT_STICK) && (player->heldItemAction == PLAYER_IA_STICK)) { + if ((fire->flags & FIRE_FLAG_INTERACT_STICK) && (player->heldItemAction == PLAYER_IA_DEKU_STICK)) { Math_Vec3f_Diff(&player->meleeWeaponInfo[0].tip, &fire->position, &dist); if (Math3D_LengthSquared(&dist) < SQ(20.0f)) { sp40 = true; |