From cd19c4d86f0d97e6ad964ce41fda8bfb87febdb9 Mon Sep 17 00:00:00 2001 From: lahm86 <33758420+lahm86@users.noreply.github.com> Date: Sat, 25 Jan 2025 10:58:06 +0000 Subject: [PATCH] lara: rename hit properties This renames Lara's various hit properties. --- src/libtrx/include/libtrx/game/collision.h | 4 +- .../include/libtrx/game/lara/enum_tr1.h | 8 +-- src/libtrx/include/libtrx/game/lara/types.h | 8 +-- src/tr1/game/creature.c | 2 +- src/tr1/game/lara/cheat.c | 4 +- src/tr1/game/lara/common.c | 8 +-- src/tr1/game/lara/common.h | 2 +- src/tr1/game/lara/control.c | 14 ++--- src/tr1/game/lara/draw.c | 8 +-- src/tr1/game/lara/hair.c | 8 +-- src/tr1/game/lara/state.c | 58 +++++++++---------- src/tr1/game/objects/effects/body_part.c | 4 +- src/tr1/game/objects/effects/missile.c | 4 +- src/tr1/game/objects/general/door.c | 2 +- src/tr1/game/objects/traps/rolling_ball.c | 2 +- src/tr1/game/savegame/savegame_bson.c | 17 +++--- src/tr1/game/savegame/savegame_legacy.c | 10 ++-- src/tr2/decomp/savegame.c | 6 +- src/tr2/game/creature.c | 2 +- src/tr2/game/lara/cheat.c | 8 +-- src/tr2/game/lara/control.c | 10 ++-- src/tr2/game/lara/misc.c | 12 ++-- src/tr2/game/lara/misc.h | 2 +- src/tr2/game/lara/state.c | 38 ++++++------ src/tr2/game/objects/effects/body_part.c | 4 +- src/tr2/game/objects/general/door.c | 5 +- src/tr2/game/objects/traps/rolling_ball.c | 2 +- src/tr2/game/objects/vehicles/skidoo_armed.c | 2 +- 28 files changed, 126 insertions(+), 128 deletions(-) diff --git a/src/libtrx/include/libtrx/game/collision.h b/src/libtrx/include/libtrx/game/collision.h index 96f0c78b9..0f5963d7e 100644 --- a/src/libtrx/include/libtrx/game/collision.h +++ b/src/libtrx/include/libtrx/game/collision.h @@ -36,7 +36,7 @@ typedef struct { uint16_t slopes_are_pits : 1; uint16_t lava_is_pit : 1; uint16_t enable_baddie_push : 1; - uint16_t enable_spaz : 1; + uint16_t enable_hit : 1; } COLL_INFO; #elif TR_VERSION == 2 @@ -72,7 +72,7 @@ typedef struct { uint16_t slopes_are_pits: 1; // 0x02 2 uint16_t lava_is_pit: 1; // 0x04 4 uint16_t enable_baddie_push: 1; // 0x08 8 - uint16_t enable_spaz: 1; // 0x10 16 + uint16_t enable_hit: 1; // 0x10 16 uint16_t hit_ceiling: 1; // 0x20 32 uint16_t pad: 10; // clang-format on diff --git a/src/libtrx/include/libtrx/game/lara/enum_tr1.h b/src/libtrx/include/libtrx/game/lara/enum_tr1.h index 3e238b298..fefbc22bf 100644 --- a/src/libtrx/include/libtrx/game/lara/enum_tr1.h +++ b/src/libtrx/include/libtrx/game/lara/enum_tr1.h @@ -91,10 +91,10 @@ typedef enum { LA_ROLLING_BALL_DEATH = 139, LA_SPIKE_DEATH = 149, LA_GRAB_LEDGE_IN = 150, - LA_SPAZ_FORWARD = 125, - LA_SPAZ_BACK = 126, - LA_SPAZ_RIGHT = 127, - LA_SPAZ_LEFT = 128, + LA_HIT_FRONT = 125, + LA_HIT_BACK = 126, + LA_HIT_RIGHT = 127, + LA_HIT_LEFT = 128, LA_SURF_CLIMB_MEDIUM = 169, LA_WADE = 170, LA_SURF_TO_WADE = 178, diff --git a/src/libtrx/include/libtrx/game/lara/types.h b/src/libtrx/include/libtrx/game/lara/types.h index 778aa797e..cd010b5a6 100644 --- a/src/libtrx/include/libtrx/game/lara/types.h +++ b/src/libtrx/include/libtrx/game/lara/types.h @@ -46,8 +46,8 @@ typedef struct { int16_t death_timer; int16_t current_active; int32_t water_surface_dist; - int16_t spaz_effect_count; - EFFECT *spaz_effect; + int16_t hit_effect_count; + EFFECT *hit_effect; int32_t mesh_effects; OBJECT_MESH *mesh_ptrs[LM_NUMBER_OF]; ITEM *target; @@ -107,7 +107,7 @@ typedef struct { int16_t dive_count; int16_t death_timer; int16_t current_active; - int16_t spaz_effect_count; + int16_t hit_effect_count; int16_t flare_age; int16_t skidoo; int16_t weapon_item; @@ -123,7 +123,7 @@ typedef struct { // clang-format on int32_t water_surface_dist; XYZ_32 last_pos; - EFFECT *spaz_effect; + EFFECT *hit_effect; uint32_t mesh_effects; OBJECT_MESH *mesh_ptrs[LM_NUMBER_OF]; ITEM *target; diff --git a/src/tr1/game/creature.c b/src/tr1/game/creature.c index e0e4676e7..00df62dda 100644 --- a/src/tr1/game/creature.c +++ b/src/tr1/game/creature.c @@ -388,7 +388,7 @@ void Creature_Collision(int16_t item_num, ITEM *lara_item, COLL_INFO *coll) if (item->hit_points <= 0) { Lara_Push(item, coll, 0, 0); } else { - Lara_Push(item, coll, coll->enable_spaz, 0); + Lara_Push(item, coll, coll->enable_hit, 0); } } } diff --git a/src/tr1/game/lara/cheat.c b/src/tr1/game/lara/cheat.c index 645e1a902..f41a0b32a 100644 --- a/src/tr1/game/lara/cheat.c +++ b/src/tr1/game/lara/cheat.c @@ -153,8 +153,8 @@ bool Lara_Cheat_EnterFlyMode(void) g_Lara.torso_rot.y = 0; } g_Lara.water_status = LWS_CHEAT; - g_Lara.spaz_effect_count = 0; - g_Lara.spaz_effect = NULL; + g_Lara.hit_effect_count = 0; + g_Lara.hit_effect = NULL; g_Lara.hit_frame = 0; g_Lara.hit_direction = -1; g_Lara.air = LARA_MAX_AIR; diff --git a/src/tr1/game/lara/common.c b/src/tr1/game/lara/common.c index 3e2ae2ffe..99ee35157 100644 --- a/src/tr1/game/lara/common.c +++ b/src/tr1/game/lara/common.c @@ -494,8 +494,8 @@ void Lara_Initialise(const GAME_FLOW_LEVEL *const level) g_Lara.hit_direction = 0; g_Lara.death_timer = 0; g_Lara.target = NULL; - g_Lara.spaz_effect = NULL; - g_Lara.spaz_effect_count = 0; + g_Lara.hit_effect = NULL; + g_Lara.hit_effect_count = 0; g_Lara.turn_rate = 0; g_Lara.move_angle = 0; g_Lara.right_arm.flash_gun = 0; @@ -710,7 +710,7 @@ bool Lara_MovePosition(ITEM *item, XYZ_32 *vec) return Item_MovePosition(g_LaraItem, item, vec, velocity); } -void Lara_Push(ITEM *item, COLL_INFO *coll, bool spaz_on, bool big_push) +void Lara_Push(ITEM *item, COLL_INFO *coll, bool hit_on, bool big_push) { ITEM *const lara_item = g_LaraItem; int32_t x = lara_item->pos.x - item->pos.x; @@ -760,7 +760,7 @@ void Lara_Push(ITEM *item, COLL_INFO *coll, bool spaz_on, bool big_push) x -= (c * rx + s * rz) >> W2V_SHIFT; z -= (c * rz - s * rx) >> W2V_SHIFT; - if (spaz_on) { + if (hit_on) { PHD_ANGLE hitang = lara_item->rot.y - (DEG_180 + Math_Atan(z, x)); g_Lara.hit_direction = (hitang + DEG_45) / DEG_90; if (!g_Lara.hit_frame) { diff --git a/src/tr1/game/lara/common.h b/src/tr1/game/lara/common.h index cde345a14..80738eb29 100644 --- a/src/tr1/game/lara/common.h +++ b/src/tr1/game/lara/common.h @@ -30,7 +30,7 @@ bool Lara_TestBoundsCollide(ITEM *item, int32_t radius); bool Lara_TestPosition(const ITEM *item, const OBJECT_BOUNDS *bounds); void Lara_AlignPosition(ITEM *item, XYZ_32 *vec); bool Lara_MovePosition(ITEM *item, XYZ_32 *vec); -void Lara_Push(ITEM *item, COLL_INFO *coll, bool spaz_on, bool big_push); +void Lara_Push(ITEM *item, COLL_INFO *coll, bool hit_on, bool big_push); void Lara_TakeDamage(int16_t damage, bool hit_status); diff --git a/src/tr1/game/lara/control.c b/src/tr1/game/lara/control.c index dcb7b07b2..295c4ac0d 100644 --- a/src/tr1/game/lara/control.c +++ b/src/tr1/game/lara/control.c @@ -142,9 +142,9 @@ static void M_BaddieCollision(ITEM *lara_item, COLL_INFO *coll) } } - if (g_Lara.spaz_effect_count && g_Lara.spaz_effect && coll->enable_spaz) { - int32_t x = g_Lara.spaz_effect->pos.x - lara_item->pos.x; - int32_t z = g_Lara.spaz_effect->pos.z - lara_item->pos.z; + if (g_Lara.hit_effect_count && g_Lara.hit_effect && coll->enable_hit) { + int32_t x = g_Lara.hit_effect->pos.x - lara_item->pos.x; + int32_t z = g_Lara.hit_effect->pos.z - lara_item->pos.z; PHD_ANGLE hitang = lara_item->rot.y - (DEG_180 + Math_Atan(z, x)); g_Lara.hit_direction = (hitang + DEG_45) / DEG_90; if (!g_Lara.hit_frame) { @@ -156,7 +156,7 @@ static void M_BaddieCollision(ITEM *lara_item, COLL_INFO *coll) g_Lara.hit_frame = 34; } - g_Lara.spaz_effect_count--; + g_Lara.hit_effect_count--; } if (g_Lara.hit_direction == -1) { @@ -184,7 +184,7 @@ void Lara_HandleAboveWater(ITEM *item, COLL_INFO *coll) coll->lava_is_pit = 0; coll->slopes_are_walls = 0; coll->slopes_are_pits = 0; - coll->enable_spaz = 1; + coll->enable_hit = 1; coll->enable_baddie_push = 1; if (g_Config.gameplay.enable_enhanced_look && item->hit_points > 0) { @@ -257,7 +257,7 @@ void Lara_HandleSurface(ITEM *item, COLL_INFO *coll) coll->slopes_are_walls = 0; coll->slopes_are_pits = 0; coll->lava_is_pit = 0; - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_LaraStateRoutines[item->current_anim_state](item, coll); @@ -322,7 +322,7 @@ void Lara_HandleUnderwater(ITEM *item, COLL_INFO *coll) coll->slopes_are_walls = 0; coll->slopes_are_pits = 0; coll->lava_is_pit = 0; - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; if (g_Config.gameplay.enable_enhanced_look && item->hit_points > 0) { diff --git a/src/tr1/game/lara/draw.c b/src/tr1/game/lara/draw.c index 7625cda16..2c5d43d42 100644 --- a/src/tr1/game/lara/draw.c +++ b/src/tr1/game/lara/draw.c @@ -58,16 +58,16 @@ void Lara_Draw(ITEM *item) switch (g_Lara.hit_direction) { default: case DIR_NORTH: - frame = Object_GetAnim(object, LA_SPAZ_FORWARD)->frame_ptr; + frame = Object_GetAnim(object, LA_HIT_FRONT)->frame_ptr; break; case DIR_EAST: - frame = Object_GetAnim(object, LA_SPAZ_RIGHT)->frame_ptr; + frame = Object_GetAnim(object, LA_HIT_RIGHT)->frame_ptr; break; case DIR_SOUTH: - frame = Object_GetAnim(object, LA_SPAZ_BACK)->frame_ptr; + frame = Object_GetAnim(object, LA_HIT_BACK)->frame_ptr; break; case DIR_WEST: - frame = Object_GetAnim(object, LA_SPAZ_LEFT)->frame_ptr; + frame = Object_GetAnim(object, LA_HIT_LEFT)->frame_ptr; break; } diff --git a/src/tr1/game/lara/hair.c b/src/tr1/game/lara/hair.c index d663a2d0d..d5f8b689c 100644 --- a/src/tr1/game/lara/hair.c +++ b/src/tr1/game/lara/hair.c @@ -111,19 +111,19 @@ void Lara_Hair_Control(void) LARA_ANIMATION hit_anim; switch (g_Lara.hit_direction) { case DIR_NORTH: - hit_anim = LA_SPAZ_FORWARD; + hit_anim = LA_HIT_FRONT; break; case DIR_SOUTH: - hit_anim = LA_SPAZ_BACK; + hit_anim = LA_HIT_BACK; break; case DIR_EAST: - hit_anim = LA_SPAZ_RIGHT; + hit_anim = LA_HIT_RIGHT; break; default: - hit_anim = LA_SPAZ_LEFT; + hit_anim = LA_HIT_LEFT; break; } diff --git a/src/tr1/game/lara/state.c b/src/tr1/game/lara/state.c index e86b84149..3ab6a3dc2 100644 --- a/src/tr1/game/lara/state.c +++ b/src/tr1/game/lara/state.c @@ -353,7 +353,7 @@ void Lara_State_TurnL(ITEM *item, COLL_INFO *coll) void Lara_State_Death(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; } @@ -371,7 +371,7 @@ void Lara_State_Hang(ITEM *item, COLL_INFO *coll) Lara_LookUpDown(); } - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_Camera.target_angle = CAM_A_HANG; g_Camera.target_elevation = CAM_E_HANG; @@ -588,7 +588,7 @@ void Lara_State_FallBack(ITEM *item, COLL_INFO *coll) void Lara_State_HangLeft(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_Camera.target_angle = CAM_A_HANG; g_Camera.target_elevation = CAM_E_HANG; @@ -599,7 +599,7 @@ void Lara_State_HangLeft(ITEM *item, COLL_INFO *coll) void Lara_State_HangRight(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_Camera.target_angle = CAM_A_HANG; g_Camera.target_elevation = CAM_E_HANG; @@ -618,7 +618,7 @@ void Lara_State_SlideBack(ITEM *item, COLL_INFO *coll) void Lara_State_PushBlock(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_Camera.flags = FOLLOW_CENTRE; g_Camera.target_angle = 35 * DEG_1; @@ -627,7 +627,7 @@ void Lara_State_PushBlock(ITEM *item, COLL_INFO *coll) void Lara_State_PullBlock(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_Camera.flags = FOLLOW_CENTRE; g_Camera.target_angle = 35 * DEG_1; @@ -636,7 +636,7 @@ void Lara_State_PullBlock(ITEM *item, COLL_INFO *coll) void Lara_State_PPReady(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_Camera.target_angle = 75 * DEG_1; if (!g_Input.action) { @@ -646,7 +646,7 @@ void Lara_State_PPReady(ITEM *item, COLL_INFO *coll) void Lara_State_Pickup(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_Camera.target_angle = -130 * DEG_1; g_Camera.target_elevation = -15 * DEG_1; @@ -655,13 +655,13 @@ void Lara_State_Pickup(ITEM *item, COLL_INFO *coll) void Lara_State_Controlled(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; } void Lara_State_SwitchOn(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_Camera.target_angle = 80 * DEG_1; g_Camera.target_elevation = -25 * DEG_1; @@ -670,7 +670,7 @@ void Lara_State_SwitchOn(ITEM *item, COLL_INFO *coll) void Lara_State_SwitchOff(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_Camera.target_angle = 80 * DEG_1; g_Camera.target_elevation = -25 * DEG_1; @@ -679,7 +679,7 @@ void Lara_State_SwitchOff(ITEM *item, COLL_INFO *coll) void Lara_State_UseKey(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_Camera.target_angle = -80 * DEG_1; g_Camera.target_elevation = -25 * DEG_1; @@ -688,7 +688,7 @@ void Lara_State_UseKey(ITEM *item, COLL_INFO *coll) void Lara_State_UsePuzzle(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_Camera.target_angle = -80 * DEG_1; g_Camera.target_elevation = -25 * DEG_1; @@ -722,7 +722,7 @@ void Lara_State_Special(ITEM *item, COLL_INFO *coll) void Lara_State_UseMidas(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; Twinkle_SparkleItem(item, (1 << LM_HAND_L) | (1 << LM_HAND_R)); } @@ -730,7 +730,7 @@ void Lara_State_UseMidas(ITEM *item, COLL_INFO *coll) void Lara_State_DieMidas(ITEM *item, COLL_INFO *coll) { item->gravity = 0; - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; Object_SetReflective(O_LARA_EXTRA, true); @@ -813,7 +813,7 @@ void Lara_State_DieMidas(ITEM *item, COLL_INFO *coll) void Lara_State_SwanDive(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 1; if (item->fall_speed > LARA_FASTFALL_SPEED && item->goal_anim_state != LS_DIVE) { @@ -828,7 +828,7 @@ void Lara_State_FastDive(ITEM *item, COLL_INFO *coll) item->goal_anim_state = LS_TWIST; } - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 1; item->speed = (item->speed * 95) / 100; } @@ -845,19 +845,19 @@ void Lara_State_UWRoll(ITEM *item, COLL_INFO *coll) void Lara_State_Null(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; } void Lara_State_Gymnast(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; } void Lara_State_WaterOut(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_Camera.flags = FOLLOW_CENTRE; } @@ -869,7 +869,7 @@ void Lara_State_SurfSwim(ITEM *item, COLL_INFO *coll) return; } - coll->enable_spaz = 0; + coll->enable_hit = 0; g_Lara.dive_timer = 0; if (!g_Config.input.enable_tr3_sidesteps || !g_Input.slow) { @@ -900,7 +900,7 @@ void Lara_State_SurfBack(ITEM *item, COLL_INFO *coll) return; } - coll->enable_spaz = 0; + coll->enable_hit = 0; g_Lara.dive_timer = 0; if (!g_Config.input.enable_tr3_sidesteps || !g_Input.slow) { @@ -928,7 +928,7 @@ void Lara_State_SurfLeft(ITEM *item, COLL_INFO *coll) return; } - coll->enable_spaz = 0; + coll->enable_hit = 0; g_Lara.dive_timer = 0; if (g_Config.input.enable_tr3_sidesteps && g_Input.slow && g_Input.left) { @@ -962,7 +962,7 @@ void Lara_State_SurfRight(ITEM *item, COLL_INFO *coll) return; } - coll->enable_spaz = 0; + coll->enable_hit = 0; g_Lara.dive_timer = 0; if (g_Config.input.enable_tr3_sidesteps && g_Input.slow && g_Input.right) { @@ -1001,7 +1001,7 @@ void Lara_State_SurfTread(ITEM *item, COLL_INFO *coll) return; } - coll->enable_spaz = 0; + coll->enable_hit = 0; if (g_Input.look) { Lara_LookLeftRightSurf(); @@ -1057,7 +1057,7 @@ void Lara_State_Swim(ITEM *item, COLL_INFO *coll) return; } - coll->enable_spaz = 0; + coll->enable_hit = 0; if (g_Config.gameplay.enable_uw_roll && g_Input.roll) { item->goal_anim_state = LS_UW_ROLL; @@ -1112,7 +1112,7 @@ void Lara_State_Glide(ITEM *item, COLL_INFO *coll) return; } - coll->enable_spaz = 0; + coll->enable_hit = 0; if (g_Config.gameplay.enable_uw_roll && g_Input.roll) { item->goal_anim_state = LS_UW_ROLL; @@ -1171,7 +1171,7 @@ void Lara_State_Tread(ITEM *item, COLL_INFO *coll) return; } - coll->enable_spaz = 0; + coll->enable_hit = 0; if (g_Config.gameplay.enable_uw_roll && g_Input.roll) { item->goal_anim_state = LS_UW_ROLL; @@ -1222,7 +1222,7 @@ void Lara_State_Dive(ITEM *item, COLL_INFO *coll) void Lara_State_UWDeath(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; item->fall_speed -= 8; if (item->fall_speed <= 0) { item->fall_speed = 0; diff --git a/src/tr1/game/objects/effects/body_part.c b/src/tr1/game/objects/effects/body_part.c index 21eb9de4a..56b8a9ed8 100644 --- a/src/tr1/game/objects/effects/body_part.c +++ b/src/tr1/game/objects/effects/body_part.c @@ -62,8 +62,8 @@ void BodyPart_Control(int16_t effect_num) effect->object_id = O_EXPLOSION_1; Sound_Effect(SFX_ATLANTEAN_EXPLODE, &effect->pos, SPM_NORMAL); - g_Lara.spaz_effect_count = 5; - g_Lara.spaz_effect = effect; + g_Lara.hit_effect_count = 5; + g_Lara.hit_effect = effect; } else { Effect_Kill(effect_num); } diff --git a/src/tr1/game/objects/effects/missile.c b/src/tr1/game/objects/effects/missile.c index e145a84a8..be2565d2e 100644 --- a/src/tr1/game/objects/effects/missile.c +++ b/src/tr1/game/objects/effects/missile.c @@ -83,8 +83,8 @@ void Missile_Control(int16_t effect_num) effect->object_id = O_EXPLOSION_1; if (g_LaraItem->hit_points > 0) { Sound_Effect(SFX_LARA_INJURY, &g_LaraItem->pos, SPM_NORMAL); - g_Lara.spaz_effect = effect; - g_Lara.spaz_effect_count = 5; + g_Lara.hit_effect = effect; + g_Lara.hit_effect_count = 5; } Sound_Effect(SFX_ATLANTEAN_EXPLODE, &effect->pos, SPM_NORMAL); } diff --git a/src/tr1/game/objects/general/door.c b/src/tr1/game/objects/general/door.c index a02899268..4293c23fe 100644 --- a/src/tr1/game/objects/general/door.c +++ b/src/tr1/game/objects/general/door.c @@ -239,7 +239,7 @@ void Door_Collision(int16_t item_num, ITEM *lara_item, COLL_INFO *coll) if (coll->enable_baddie_push) { if (item->current_anim_state != item->goal_anim_state) { - Lara_Push(item, coll, coll->enable_spaz, true); + Lara_Push(item, coll, coll->enable_hit, true); } else { Lara_Push(item, coll, false, true); } diff --git a/src/tr1/game/objects/traps/rolling_ball.c b/src/tr1/game/objects/traps/rolling_ball.c index b5fb64ab7..1c22deb0b 100644 --- a/src/tr1/game/objects/traps/rolling_ball.c +++ b/src/tr1/game/objects/traps/rolling_ball.c @@ -131,7 +131,7 @@ void RollingBall_Collision(int16_t item_num, ITEM *lara_item, COLL_INFO *coll) int32_t x, y, z, d; if (lara_item->gravity) { if (coll->enable_baddie_push) { - Lara_Push(item, coll, coll->enable_spaz, true); + Lara_Push(item, coll, coll->enable_hit, true); } lara_item->hit_points -= ROLLINGBALL_DAMAGE_AIR; x = lara_item->pos.x - item->pos.x; diff --git a/src/tr1/game/savegame/savegame_bson.c b/src/tr1/game/savegame/savegame_bson.c index aacad3a86..746fc1880 100644 --- a/src/tr1/game/savegame/savegame_bson.c +++ b/src/tr1/game/savegame/savegame_bson.c @@ -773,11 +773,11 @@ static bool M_LoadLara( lara->current_active = JSON_ObjectGetInt(lara_obj, "current_active", lara->current_active); - lara->spaz_effect_count = JSON_ObjectGetInt( - lara_obj, "spaz_effect_count", lara->spaz_effect_count); - int spaz_effect = JSON_ObjectGetInt(lara_obj, "spaz_effect", 0); - lara->spaz_effect = spaz_effect && g_Config.gameplay.enable_enhanced_saves - ? Effect_Get(spaz_effect) + lara->hit_effect_count = + JSON_ObjectGetInt(lara_obj, "hit_effect_count", lara->hit_effect_count); + const int32_t hit_effect = JSON_ObjectGetInt(lara_obj, "hit_effect", 0); + lara->hit_effect = hit_effect && g_Config.gameplay.enable_enhanced_saves + ? Effect_Get(hit_effect) : NULL; lara->mesh_effects = @@ -1222,11 +1222,10 @@ static JSON_OBJECT *M_DumpLara(LARA_INFO *lara) JSON_ObjectAppendInt(lara_obj, "death_count", lara->death_timer); JSON_ObjectAppendInt(lara_obj, "current_active", lara->current_active); + JSON_ObjectAppendInt(lara_obj, "hit_effect_count", lara->hit_effect_count); JSON_ObjectAppendInt( - lara_obj, "spaz_effect_count", lara->spaz_effect_count); - JSON_ObjectAppendInt( - lara_obj, "spaz_effect", - lara->spaz_effect ? Effect_GetNum(lara->spaz_effect) : 0); + lara_obj, "hit_effect", + lara->hit_effect ? Effect_GetNum(lara->hit_effect) : 0); JSON_ObjectAppendInt(lara_obj, "mesh_effects", lara->mesh_effects); JSON_ARRAY *lara_meshes_arr = JSON_ArrayNew(); diff --git a/src/tr1/game/savegame/savegame_legacy.c b/src/tr1/game/savegame/savegame_legacy.c index 8dcdae3b9..b092cf356 100644 --- a/src/tr1/game/savegame/savegame_legacy.c +++ b/src/tr1/game/savegame/savegame_legacy.c @@ -235,11 +235,11 @@ static void M_WriteLara(LARA_INFO *lara) M_Write(&lara->dive_timer, sizeof(int16_t)); M_Write(&lara->death_timer, sizeof(int16_t)); M_Write(&lara->current_active, sizeof(int16_t)); - M_Write(&lara->spaz_effect_count, sizeof(int16_t)); + M_Write(&lara->hit_effect_count, sizeof(int16_t)); // OG just writes the pointer address (!). - if (lara->spaz_effect) { - tmp32 = Effect_GetNum(lara->spaz_effect); + if (lara->hit_effect) { + tmp32 = Effect_GetNum(lara->hit_effect); } M_Write(&tmp32, sizeof(int32_t)); @@ -342,9 +342,9 @@ static void M_ReadLara(LARA_INFO *lara) M_Read(&lara->dive_timer, sizeof(int16_t)); M_Read(&lara->death_timer, sizeof(int16_t)); M_Read(&lara->current_active, sizeof(int16_t)); - M_Read(&lara->spaz_effect_count, sizeof(int16_t)); + M_Read(&lara->hit_effect_count, sizeof(int16_t)); - lara->spaz_effect = NULL; + lara->hit_effect = NULL; M_Skip(4); // pointer to EFFECT M_Read(&lara->mesh_effects, sizeof(int32_t)); diff --git a/src/tr2/decomp/savegame.c b/src/tr2/decomp/savegame.c index 31fd4f271..7308cb342 100644 --- a/src/tr2/decomp/savegame.c +++ b/src/tr2/decomp/savegame.c @@ -308,7 +308,7 @@ static void M_ReadLara(LARA_INFO *const lara) lara->dive_count = M_ReadS16(); lara->death_timer = M_ReadS16(); lara->current_active = M_ReadS16(); - lara->spaz_effect_count = M_ReadS16(); + lara->hit_effect_count = M_ReadS16(); lara->flare_age = M_ReadS16(); lara->skidoo = M_ReadS16(); lara->weapon_item = M_ReadS16(); @@ -329,7 +329,7 @@ static void M_ReadLara(LARA_INFO *const lara) lara->last_pos.y = M_ReadS32(); lara->last_pos.z = M_ReadS32(); M_Skip(4); - lara->spaz_effect = NULL; + lara->hit_effect = NULL; lara->mesh_effects = M_ReadU32(); for (int32_t i = 0; i < LM_NUMBER_OF; i++) { @@ -539,7 +539,7 @@ static void M_WriteLara(const LARA_INFO *const lara) M_WriteS16(lara->dive_count); M_WriteS16(lara->death_timer); M_WriteS16(lara->current_active); - M_WriteS16(lara->spaz_effect_count); + M_WriteS16(lara->hit_effect_count); M_WriteS16(lara->flare_age); M_WriteS16(lara->skidoo); M_WriteS16(lara->weapon_item); diff --git a/src/tr2/game/creature.c b/src/tr2/game/creature.c index 009cf6fb2..dbaaada06 100644 --- a/src/tr2/game/creature.c +++ b/src/tr2/game/creature.c @@ -913,7 +913,7 @@ void Creature_Collision( if (coll->enable_baddie_push && g_Lara.water_status != LWS_UNDERWATER && g_Lara.water_status != LWS_SURFACE) { - Lara_Push(item, lara_item, coll, coll->enable_spaz, false); + Lara_Push(item, lara_item, coll, coll->enable_hit, false); } } diff --git a/src/tr2/game/lara/cheat.c b/src/tr2/game/lara/cheat.c index c16abd012..c37efe321 100644 --- a/src/tr2/game/lara/cheat.c +++ b/src/tr2/game/lara/cheat.c @@ -145,8 +145,8 @@ bool Lara_Cheat_EnterFlyMode(void) } g_Lara.water_status = LWS_CHEAT; - g_Lara.spaz_effect_count = 0; - g_Lara.spaz_effect = NULL; + g_Lara.hit_effect_count = 0; + g_Lara.hit_effect = NULL; g_Lara.hit_frame = 0; g_Lara.hit_direction = -1; g_Lara.air = LARA_MAX_AIR; @@ -411,8 +411,8 @@ bool Lara_Cheat_Teleport(int32_t x, int32_t y, int32_t z) M_ReinitialiseGunMeshes(); } - g_Lara.spaz_effect_count = 0; - g_Lara.spaz_effect = NULL; + g_Lara.hit_effect_count = 0; + g_Lara.hit_effect = NULL; g_Lara.hit_frame = 0; g_Lara.hit_direction = -1; g_Lara.air = LARA_MAX_AIR; diff --git a/src/tr2/game/lara/control.c b/src/tr2/game/lara/control.c index 4bc8aa8c1..5efbda58a 100644 --- a/src/tr2/game/lara/control.c +++ b/src/tr2/game/lara/control.c @@ -218,7 +218,7 @@ void Lara_HandleAboveWater(ITEM *const item, COLL_INFO *const coll) coll->slopes_are_pits = 0; coll->lava_is_pit = 0; coll->enable_baddie_push = 1; - coll->enable_spaz = 1; + coll->enable_hit = 1; if (g_Input.look && !g_Lara.extra_anim && g_Lara.look) { Lara_LookLeftRight(); @@ -294,7 +294,7 @@ void Lara_HandleSurface(ITEM *const item, COLL_INFO *const coll) coll->slopes_are_pits = 0; coll->lava_is_pit = 0; coll->enable_baddie_push = 0; - coll->enable_spaz = 0; + coll->enable_hit = 0; if (g_Input.look && g_Lara.look) { Lara_LookLeftRight(); @@ -351,7 +351,7 @@ void Lara_HandleUnderwater(ITEM *const item, COLL_INFO *const coll) coll->slopes_are_pits = 0; coll->lava_is_pit = 0; coll->enable_baddie_push = 1; - coll->enable_spaz = 0; + coll->enable_hit = 0; if (g_Input.look && g_Lara.look) { Lara_LookLeftRight(); @@ -788,7 +788,7 @@ void Lara_Initialise(const GAME_FLOW_LEVEL *const level) g_Lara.dive_count = 0; g_Lara.death_timer = 0; g_Lara.current_active = 0; - g_Lara.spaz_effect_count = 0; + g_Lara.hit_effect_count = 0; g_Lara.flare_age = 0; g_Lara.back_gun = 0; g_Lara.flare_frame = 0; @@ -799,7 +799,7 @@ void Lara_Initialise(const GAME_FLOW_LEVEL *const level) g_Lara.burn = 0; g_Lara.water_surface_dist = 100; g_Lara.last_pos = item->pos; - g_Lara.spaz_effect = NULL; + g_Lara.hit_effect = NULL; g_Lara.mesh_effects = 0; g_Lara.target = NULL; g_Lara.turn_rate = 0; diff --git a/src/tr2/game/lara/misc.c b/src/tr2/game/lara/misc.c index e920eb041..7f2242702 100644 --- a/src/tr2/game/lara/misc.c +++ b/src/tr2/game/lara/misc.c @@ -994,10 +994,10 @@ void Lara_GetJointAbsPosition_I( void Lara_TakeHit(ITEM *const lara_item, const COLL_INFO *const coll) { - const int32_t dx = g_Lara.spaz_effect->pos.x - lara_item->pos.x; - const int32_t dz = g_Lara.spaz_effect->pos.z - lara_item->pos.z; + const int32_t dx = g_Lara.hit_effect->pos.x - lara_item->pos.x; + const int32_t dz = g_Lara.hit_effect->pos.z - lara_item->pos.z; M_TakeHit(lara_item, dx, dz); - g_Lara.spaz_effect_count--; + g_Lara.hit_effect_count--; } void Lara_BaddieCollision(ITEM *lara_item, COLL_INFO *coll) @@ -1054,7 +1054,7 @@ void Lara_BaddieCollision(ITEM *lara_item, COLL_INFO *coll) } } - if (g_Lara.spaz_effect_count) { + if (g_Lara.hit_effect_count) { Lara_TakeHit(lara_item, coll); } @@ -1067,7 +1067,7 @@ void Lara_BaddieCollision(ITEM *lara_item, COLL_INFO *coll) void Lara_Push( const ITEM *const item, ITEM *const lara_item, COLL_INFO *const coll, - const bool spaz_on, const bool big_push) + const bool hit_on, const bool big_push) { int32_t dx = lara_item->pos.x - item->pos.x; int32_t dz = lara_item->pos.z - item->pos.z; @@ -1116,7 +1116,7 @@ void Lara_Push( dx -= (c * rx + s * rz) >> W2V_SHIFT; dz -= (c * rz - s * rx) >> W2V_SHIFT; - if (spaz_on && bounds->max.y - bounds->min.y > STEP_L) { + if (hit_on && bounds->max.y - bounds->min.y > STEP_L) { M_TakeHit(lara_item, dx, dz); } diff --git a/src/tr2/game/lara/misc.h b/src/tr2/game/lara/misc.h index f24085679..518551ffa 100644 --- a/src/tr2/game/lara/misc.h +++ b/src/tr2/game/lara/misc.h @@ -49,7 +49,7 @@ void Lara_GetJointAbsPosition_I( void Lara_BaddieCollision(ITEM *lara_item, COLL_INFO *coll); void Lara_TakeHit(ITEM *lara_item, const COLL_INFO *coll); void Lara_Push( - const ITEM *item, ITEM *lara_item, COLL_INFO *coll, bool spaz_on, + const ITEM *item, ITEM *lara_item, COLL_INFO *coll, bool hit_on, bool big_push); int32_t Lara_MovePosition(XYZ_32 *vec, ITEM *item, ITEM *lara_item); int32_t Lara_IsNearItem(const XYZ_32 *pos, int32_t distance); diff --git a/src/tr2/game/lara/state.c b/src/tr2/game/lara/state.c index b8c9ec02d..840cc338e 100644 --- a/src/tr2/game/lara/state.c +++ b/src/tr2/game/lara/state.c @@ -310,7 +310,7 @@ void Lara_State_TurnLeft(ITEM *item, COLL_INFO *coll) void Lara_State_Death(ITEM *item, COLL_INFO *coll) { g_Lara.look = 0; - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; } @@ -328,7 +328,7 @@ void Lara_State_Hang(ITEM *item, COLL_INFO *coll) Lara_LookUpDown(); } - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_Camera.target_angle = CAM_HANG_ANGLE; g_Camera.target_elevation = CAM_HANG_ELEVATION; @@ -409,7 +409,7 @@ void Lara_State_Back(ITEM *item, COLL_INFO *coll) void Lara_State_Null(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; } @@ -547,7 +547,7 @@ void Lara_State_Fallback(ITEM *item, COLL_INFO *coll) void Lara_State_HangLeft(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_Camera.target_angle = CAM_HANG_ANGLE; g_Camera.target_elevation = CAM_HANG_ELEVATION; @@ -558,7 +558,7 @@ void Lara_State_HangLeft(ITEM *item, COLL_INFO *coll) void Lara_State_HangRight(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_Camera.target_angle = CAM_HANG_ANGLE; g_Camera.target_elevation = CAM_HANG_ELEVATION; @@ -577,7 +577,7 @@ void Lara_State_SlideBack(ITEM *item, COLL_INFO *coll) void Lara_State_PushBlock(ITEM *item, COLL_INFO *coll) { g_Lara.look = 0; - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_Camera.flags = CF_FOLLOW_CENTRE; g_Camera.target_angle = CAM_PUSH_BLOCK_ANGLE; @@ -586,7 +586,7 @@ void Lara_State_PushBlock(ITEM *item, COLL_INFO *coll) void Lara_State_PPReady(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_Camera.target_angle = CAM_PP_READY_ANGLE; if (!g_Input.action) { @@ -597,7 +597,7 @@ void Lara_State_PPReady(ITEM *item, COLL_INFO *coll) void Lara_State_Pickup(ITEM *item, COLL_INFO *coll) { g_Lara.look = 0; - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_Camera.target_angle = CAM_PICKUP_ANGLE; g_Camera.target_elevation = CAM_PICKUP_ELEVATION; @@ -618,7 +618,7 @@ void Lara_State_PickupFlare(ITEM *item, COLL_INFO *coll) void Lara_State_SwitchOn(ITEM *item, COLL_INFO *coll) { g_Lara.look = 0; - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_Camera.target_angle = CAM_SWITCH_ON_ANGLE; g_Camera.target_elevation = CAM_SWITCH_ON_ELEVATION; @@ -629,7 +629,7 @@ void Lara_State_SwitchOn(ITEM *item, COLL_INFO *coll) void Lara_State_UseKey(ITEM *item, COLL_INFO *coll) { g_Lara.look = 0; - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_Camera.target_angle = CAM_USE_KEY_ANGLE; g_Camera.target_elevation = CAM_USE_KEY_ELEVATION; @@ -645,7 +645,7 @@ void Lara_State_Special(ITEM *item, COLL_INFO *coll) void Lara_State_SwanDive(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 1; if (item->fall_speed > LARA_FAST_FALL_SPEED && item->goal_anim_state != LS_DIVE) { @@ -658,14 +658,14 @@ void Lara_State_FastDive(ITEM *item, COLL_INFO *coll) if (g_Input.roll && item->goal_anim_state == LS_FAST_DIVE) { item->goal_anim_state = LS_TWIST; } - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 1; item->speed = item->speed * 95 / 100; } void Lara_State_WaterOut(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_Camera.flags = CF_FOLLOW_CENTRE; } @@ -838,7 +838,7 @@ void Lara_State_Extra_FinalAnim(ITEM *item, COLL_INFO *coll) void Lara_State_ClimbLeft(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_Camera.target_angle = CAM_CLIMB_LEFT_ANGLE; g_Camera.target_elevation = CAM_CLIMB_LEFT_ELEVATION; @@ -849,7 +849,7 @@ void Lara_State_ClimbLeft(ITEM *item, COLL_INFO *coll) void Lara_State_ClimbRight(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_Camera.target_angle = CAM_CLIMB_RIGHT_ANGLE; g_Camera.target_elevation = CAM_CLIMB_RIGHT_ELEVATION; @@ -860,7 +860,7 @@ void Lara_State_ClimbRight(ITEM *item, COLL_INFO *coll) void Lara_State_ClimbStance(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_Camera.target_elevation = CAM_CLIMB_STANCE_ELEVATION; @@ -881,14 +881,14 @@ void Lara_State_ClimbStance(ITEM *item, COLL_INFO *coll) void Lara_State_Climbing(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_Camera.target_elevation = CAM_CLIMBING_ELEVATION; } void Lara_State_ClimbEnd(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_Camera.flags = CF_FOLLOW_CENTRE; g_Camera.target_angle = CAM_CLIMB_END_ELEVATION; @@ -896,7 +896,7 @@ void Lara_State_ClimbEnd(ITEM *item, COLL_INFO *coll) void Lara_State_ClimbDown(ITEM *item, COLL_INFO *coll) { - coll->enable_spaz = 0; + coll->enable_hit = 0; coll->enable_baddie_push = 0; g_Camera.target_elevation = CAM_CLIMB_DOWN_ELEVATION; } diff --git a/src/tr2/game/objects/effects/body_part.c b/src/tr2/game/objects/effects/body_part.c index c08cc143f..39e2fd598 100644 --- a/src/tr2/game/objects/effects/body_part.c +++ b/src/tr2/game/objects/effects/body_part.c @@ -80,8 +80,8 @@ void BodyPart_Control(const int16_t effect_num) effect->object_id = O_EXPLOSION; effect->shade = HIGH_LIGHT; Sound_Effect(SFX_EXPLOSION_1, &effect->pos, SPM_NORMAL); - g_Lara.spaz_effect_count = 5; - g_Lara.spaz_effect = effect; + g_Lara.hit_effect_count = 5; + g_Lara.hit_effect = effect; } else { Effect_Kill(effect_num); } diff --git a/src/tr2/game/objects/general/door.c b/src/tr2/game/objects/general/door.c index d5dbb5e76..f910a81bf 100644 --- a/src/tr2/game/objects/general/door.c +++ b/src/tr2/game/objects/general/door.c @@ -206,9 +206,8 @@ void Door_Collision( if (coll->enable_baddie_push) { Lara_Push( item, lara_item, coll, - item->current_anim_state != item->goal_anim_state - ? coll->enable_spaz - : false, + item->current_anim_state != item->goal_anim_state ? coll->enable_hit + : false, true); } } diff --git a/src/tr2/game/objects/traps/rolling_ball.c b/src/tr2/game/objects/traps/rolling_ball.c index cd643da0b..2f5f2787f 100644 --- a/src/tr2/game/objects/traps/rolling_ball.c +++ b/src/tr2/game/objects/traps/rolling_ball.c @@ -160,7 +160,7 @@ void RollingBall_Collision( if (lara_item->gravity) { if (coll->enable_baddie_push) { - Lara_Push(item, lara_item, coll, coll->enable_spaz, true); + Lara_Push(item, lara_item, coll, coll->enable_hit, true); } lara_item->hit_points -= ROLLING_BALL_DAMAGE_AIR; diff --git a/src/tr2/game/objects/vehicles/skidoo_armed.c b/src/tr2/game/objects/vehicles/skidoo_armed.c index a39d88a2d..4260d0fb8 100644 --- a/src/tr2/game/objects/vehicles/skidoo_armed.c +++ b/src/tr2/game/objects/vehicles/skidoo_armed.c @@ -88,7 +88,7 @@ void SkidooArmed_Collision( if (coll->enable_baddie_push) { Lara_Push( - item, lara_item, coll, item->speed > 0 ? coll->enable_spaz : false, + item, lara_item, coll, item->speed > 0 ? coll->enable_hit : false, false); }