diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2022-11-06 21:31:55 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-06 21:31:55 -0300 |
| commit | 65cf949bc04f71c93a8f7f3862339e1f1cac7337 (patch) | |
| tree | 393a6320d2a0514d2d58d6aba73cd83cfbb37d29 /src/code/z_fireobj.c | |
| parent | a8c7a5bb8940e7890c44c1a2d95fc3bfc34750b6 (diff) | |
Rename `ActionParam` to `ItemAction` (#1069)
* Rename `ActionParam` to `ItemParam`
* namefixer
* ItemAction
* merge issues
* merge
* fixes
* format
* renames
* format
* <= PLAYER_IA_MINUS1
* fixes
* more fixes
* e
* revew
* simple replace in namefixer
* fixes
* merge fixes
* merge fixes
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 d0b88b3db..e4f014ffa 100644 --- a/src/code/z_fireobj.c +++ b/src/code/z_fireobj.c @@ -118,7 +118,7 @@ void FireObj_UpdateStateTransitions(PlayState* play, FireObj* fire) { (waterY - fire->position.y > 6500.0f * fire->yScale)) { FireObj_SetState(fire, fire->dynamicSizeStep, FIRE_STATE_3); } - if ((fire->flags & 2) && (player->itemActionParam == PLAYER_AP_STICK)) { + if ((fire->flags & 2) && (player->heldItemAction == PLAYER_IA_STICK)) { Math_Vec3f_Diff(&player->meleeWeaponInfo[0].tip, &fire->position, &dist); if (Math3D_LengthSquared(&dist) < 400.0f) { sp40 = true; |