diff --git a/meson.build b/meson.build index 6ad310af..f413ad4d 100644 --- a/meson.build +++ b/meson.build @@ -91,7 +91,6 @@ dll_sources = [ 'src/game/camera.c', 'src/game/clock.c', 'src/game/collide.c', - 'src/game/console/cmd/die.c', 'src/game/console/cmd/end_level.c', 'src/game/console/cmd/exit_game.c', 'src/game/console/cmd/exit_to_title.c', diff --git a/src/game/console/cmd/die.c b/src/game/console/cmd/die.c deleted file mode 100644 index 20c121b6..00000000 --- a/src/game/console/cmd/die.c +++ /dev/null @@ -1,30 +0,0 @@ -#include "game/console/cmd/die.h" - -#include "decomp/effects.h" -#include "game/sound.h" -#include "global/vars.h" - -static COMMAND_RESULT M_Entrypoint(const char *args); - -static COMMAND_RESULT M_Entrypoint(const char *const args) -{ - if (!g_Objects[O_LARA].loaded) { - return CR_UNAVAILABLE; - } - - if (g_LaraItem->hit_points <= 0) { - return CR_UNAVAILABLE; - } - - Sound_Effect(SFX_LARA_FALL, &g_LaraItem->pos, SPM_NORMAL); - Effect_ExplodingDeath(g_Lara.item_num, -1, 1); - - g_LaraItem->hit_points = 0; - g_LaraItem->flags |= IF_INVISIBLE; - return CR_SUCCESS; -} - -CONSOLE_COMMAND g_Console_Cmd_Die = { - .prefix = "abortion|natlastinks", - .proc = M_Entrypoint, -}; diff --git a/src/game/console/cmd/die.h b/src/game/console/cmd/die.h deleted file mode 100644 index bf50d44b..00000000 --- a/src/game/console/cmd/die.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include - -extern CONSOLE_COMMAND g_Console_Cmd_Die; diff --git a/src/game/console/setup.c b/src/game/console/setup.c index be2f09fa..f7da151f 100644 --- a/src/game/console/setup.c +++ b/src/game/console/setup.c @@ -1,6 +1,5 @@ #include "game/console/setup.h" -#include "game/console/cmd/die.h" #include "game/console/cmd/end_level.h" #include "game/console/cmd/exit_game.h" #include "game/console/cmd/exit_to_title.h" @@ -12,6 +11,7 @@ #include "game/console/cmd/teleport.h" #include +#include #include #include #include diff --git a/subprojects/libtrx b/subprojects/libtrx index 99c5dd40..c984f369 160000 --- a/subprojects/libtrx +++ b/subprojects/libtrx @@ -1 +1 @@ -Subproject commit 99c5dd40f02f975cad20ed1bb0eefa6e140865c9 +Subproject commit c984f369d2e7903ec0cd4c5fa5724aeaa8d571b2