console/cmd: move /kill to libtrx

meson.build

@@ -96,7 +96,6 @@ dll_sources = [
   'src/game/console/cmd/exit_to_title.c',
   'src/game/console/cmd/flipmap.c',
   'src/game/console/cmd/fly.c',
-  'src/game/console/cmd/kill.c',
   'src/game/console/cmd/load_game.c',
   'src/game/console/cmd/play_demo.c',
   'src/game/console/cmd/play_level.c',

src/game/console/setup.c

@@ -6,7 +6,6 @@
 #include "game/console/cmd/exit_to_title.h"
 #include "game/console/cmd/flipmap.h"
 #include "game/console/cmd/fly.h"
-#include "game/console/cmd/kill.h"
 #include "game/console/cmd/load_game.h"
 #include "game/console/cmd/play_demo.h"
 #include "game/console/cmd/play_level.h"
@@ -16,6 +15,7 @@
 #include <libtrx/game/console/cmd/config.h>
 #include <libtrx/game/console/cmd/give_item.h>
 #include <libtrx/game/console/cmd/heal.h>
+#include <libtrx/game/console/cmd/kill.h>
 #include <libtrx/game/console/cmd/pos.h>
 #include <libtrx/game/console/cmd/set_health.h>
 

src/game/creature.c

@@ -952,5 +952,5 @@ bool Creature_IsEnemy(const ITEM_INFO *const item)
 
 bool Creature_IsAlly(const ITEM_INFO *const item)
 {
-    return Object_IsObjectType(item->object_id, g_FriendObjects);
+    return Object_IsObjectType(item->object_id, g_AllyObjects);
 }

src/game/game_string.def

@@ -13,15 +13,9 @@ GS_DEFINE(OSD_FLIPMAP_ON, "Flipmap set to ON")
 GS_DEFINE(OSD_FLIPMAP_OFF, "Flipmap set to OFF")
 GS_DEFINE(OSD_FLIPMAP_FAIL_ALREADY_ON, "Flipmap is already ON")
 GS_DEFINE(OSD_FLIPMAP_FAIL_ALREADY_OFF, "Flipmap is already OFF")
-GS_DEFINE(OSD_KILL_ALL, "Poof! %d enemies gone!")
-GS_DEFINE(OSD_KILL_ALL_FAIL, "Uh-oh, there are no enemies left to kill...")
-GS_DEFINE(OSD_KILL, "Bye-bye!")
-GS_DEFINE(OSD_KILL_FAIL, "No enemy nearby...")
 GS_DEFINE(OSD_COMPLETE_LEVEL, "Level complete!")
 GS_DEFINE(OSD_PLAY_LEVEL, "Loading %s")
 GS_DEFINE(OSD_INVALID_ROOM, "Invalid room: %d. Valid rooms are 0-%d")
-GS_DEFINE(OSD_INVALID_OBJECT, "Invalid object")
-GS_DEFINE(OSD_OBJECT_NOT_FOUND, "Object not found")
 GS_DEFINE(OSD_INVALID_LEVEL, "Invalid level")
 GS_DEFINE(OSD_INVALID_SAVE_SLOT, "Invalid save slot %d")
 GS_DEFINE(OSD_UNKNOWN_COMMAND, "Unknown command: %s")

src/game/items.c

@@ -732,3 +732,8 @@ int32_t Item_GetDistance(
 {
     return XYZ_32_GetDistance(&item->pos, target);
 }
+
+ITEM_INFO *Item_Get(const int16_t item_num)
+{
+    return &g_Items[item_num];
+}

src/game/objects/vars.c

@@ -44,7 +44,7 @@ const GAME_OBJECT_ID g_EnemyObjects[] = {
     // clang-format on
 };
 
-const GAME_OBJECT_ID g_FriendObjects[] = {
+const GAME_OBJECT_ID g_AllyObjects[] = {
     // clang-format off
     O_LARA,
     O_WINSTON,

src/game/objects/vars.h

@@ -4,7 +4,7 @@
 #include "global/types.h"
 
 extern const GAME_OBJECT_ID g_EnemyObjects[];
-extern const GAME_OBJECT_ID g_FriendObjects[];
+extern const GAME_OBJECT_ID g_AllyObjects[];
 extern const GAME_OBJECT_ID g_PickupObjects[];
 extern const GAME_OBJECT_ID g_DoorObjects[];
 extern const GAME_OBJECT_ID g_TrapdoorObjects[];