diff --git a/src/game/lara/lara.c b/src/game/lara/lara.c index 6beea1e63..f38738e2e 100644 --- a/src/game/lara/lara.c +++ b/src/game/lara/lara.c @@ -64,7 +64,7 @@ void Lara_Control(void) if (g_Lara.water_status == LWS_ABOVE_WATER && room_submerged) { g_Lara.water_status = LWS_UNDERWATER; - g_Lara.air = LARA_AIR; + g_Lara.air = LARA_MAX_AIR; item->pos.y += 100; item->gravity_status = 0; Item_UpdateRoom(item, 0); @@ -168,7 +168,7 @@ void Lara_Control(void) switch (g_Lara.water_status) { case LWS_ABOVE_WATER: - g_Lara.air = LARA_AIR; + g_Lara.air = LARA_MAX_AIR; Lara_HandleAboveWater(item, &coll); break; @@ -186,8 +186,8 @@ void Lara_Control(void) case LWS_SURFACE: if (item->hit_points >= 0) { g_Lara.air += 10; - if (g_Lara.air > LARA_AIR) { - g_Lara.air = LARA_AIR; + if (g_Lara.air > LARA_MAX_AIR) { + g_Lara.air = LARA_MAX_AIR; } } Lara_HandleSurface(item, &coll); @@ -453,7 +453,7 @@ void Lara_Initialise(int32_t level_num) g_LaraItem->hit_points = g_Config.start_lara_hitpoints; } - g_Lara.air = LARA_AIR; + g_Lara.air = LARA_MAX_AIR; g_Lara.torso_rot.y = 0; g_Lara.torso_rot.x = 0; g_Lara.torso_rot.z = 0; diff --git a/src/game/lara/lara_cheat.c b/src/game/lara/lara_cheat.c index 9f251a756..202949fde 100644 --- a/src/game/lara/lara_cheat.c +++ b/src/game/lara/lara_cheat.c @@ -154,7 +154,7 @@ bool Lara_Cheat_EnterFlyMode(void) g_Lara.spaz_effect = NULL; g_Lara.hit_frame = 0; g_Lara.hit_direction = -1; - g_Lara.air = LARA_AIR; + g_Lara.air = LARA_MAX_AIR; g_Lara.death_timer = 0; g_Lara.mesh_effects = 0; Lara_InitialiseMeshes(g_CurrentLevel); diff --git a/src/game/overlay.c b/src/game/overlay.c index 0649fce75..ef3db7601 100644 --- a/src/game/overlay.c +++ b/src/game/overlay.c @@ -153,9 +153,9 @@ static void Overlay_BarSetupHealth(void) static void Overlay_BarSetupAir(void) { - m_AirBar.type = BT_LARA_AIR; - m_AirBar.value = LARA_AIR; - m_AirBar.max_value = LARA_AIR; + m_AirBar.type = BT_LARA_MAX_AIR; + m_AirBar.value = LARA_MAX_AIR; + m_AirBar.max_value = LARA_MAX_AIR; m_AirBar.show_mode = g_Config.airbar_show_mode; m_AirBar.show = false; m_AirBar.blink = false; diff --git a/src/global/const.h b/src/global/const.h index 4f019517b..4a53c9cda 100644 --- a/src/global/const.h +++ b/src/global/const.h @@ -41,7 +41,7 @@ #define GRAVITY 6 #define FASTFALL_SPEED 128 #define LARA_MAX_HITPOINTS 1000 -#define LARA_AIR 1800 +#define LARA_MAX_AIR 1800 #define LARA_TURN_UNDO (2 * PHD_DEGREE) // = 364 #define LARA_TURN_RATE ((PHD_DEGREE / 4) + LARA_TURN_UNDO) // = 409 #define LARA_SLOW_TURN ((PHD_DEGREE * 2) + LARA_TURN_UNDO) // = 728 diff --git a/src/global/types.h b/src/global/types.h index 6e568f765..599d25622 100644 --- a/src/global/types.h +++ b/src/global/types.h @@ -1010,7 +1010,7 @@ typedef enum GAMEFLOW_SEQUENCE_TYPE { typedef enum BAR_TYPE { BT_LARA_HEALTH = 0, - BT_LARA_AIR = 1, + BT_LARA_MAX_AIR = 1, BT_ENEMY_HEALTH = 2, BT_PROGRESS = 3, } BAR_TYPE;