Skip to content
This repository has been archived by the owner on Oct 4, 2024. It is now read-only.

console/cmd: tidy explosion sounds #34

Merged
merged 1 commit into from
Sep 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions include/libtrx/game/sound/ids.h
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ typedef enum SOUND_EFFECT_ID {
SFX_PIERRE_SPEECH = 203,
SFX_SKATEKID_SPEECH = 204,
SFX_LARA_SETUP = 205,
SFX_EXPLOSION_CHEAT = 206,
SFX_EXPLOSION_CHEAT = SFX_ATLANTEAN_EXPLODE,
// clang-format on
} SOUND_EFFECT_ID;

Expand Down Expand Up @@ -310,7 +310,7 @@ typedef enum {
SFX_TIGER_DEATH = 102,
SFX_TIGER_GROWL = 103,
SFX_M16_STOP = 104,
SFX_EXPLOSION1 = 105,
SFX_EXPLOSION_1 = 105,
SFX_GROWL = 106,
SFX_SPIDER_JUMP = 107,
SFX_MENU_ROTATE = 108,
Expand Down Expand Up @@ -538,9 +538,10 @@ typedef enum {
SFX_SPIDER_EXPLODE = 349,
SFX_SHARK_BITE = 350,
SFX_LAVA_BUBBLES = 351,
SFX_EXPLOSION2 = 352,
SFX_EXPLOSION_2 = 352,
SFX_BURGLARS = 353,
SFX_ZIPPER = 354,
SFX_EXPLOSION_CHEAT = SFX_EXPLOSION_1,
SFX_NUMBER_OF = 370,
} SOUND_EFFECT_ID;
// clang-format on
Expand Down
2 changes: 0 additions & 2 deletions src/game/console/cmd/die.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ static COMMAND_RESULT M_Entrypoint(const char *const args)
}

Sound_Effect(SFX_LARA_FALL, &lara_item->pos, SPM_NORMAL);
#if TR_VERSION == 1
Sound_Effect(SFX_EXPLOSION_CHEAT, &lara_item->pos, SPM_NORMAL);
#endif
Effect_ExplodingDeath(lara->item_num, -1, 1);

lara_item->hit_points = 0;
Expand Down