Add /sfx; move various types and commands to libtrx

CHANGELOG.md

@@ -1,4 +1,5 @@
 ## [Unreleased](https://github.com/LostArtefacts/TR2X/compare/stable...develop) - ××××-××-××
+- added `/sfx` command
 
 ## [0.3](https://github.com/LostArtefacts/TR2X/compare/0.2-460-g4721b93...0.3) - 2024-09-20
 - added new console commands:

COMMANDS.md

@@ -59,3 +59,7 @@ Currently supported commands:
 
 - `/exit`  
   Closes the game.
+
+- `/sfx`  
+- `/sfx {sound}`  
+  Plays a given sound sample.

data/ship/cfg/TR2X_gameflow.json5

@@ -380,6 +380,7 @@
         "OSD_INVALID_LEVEL": "Invalid level",
         "OSD_INVALID_OBJECT": "Invalid object",
         "OSD_INVALID_ROOM": "Invalid room: %d. Valid rooms are 0-%d",
+        "OSD_INVALID_SAMPLE": "Invalid sound: %d",
         "OSD_INVALID_SAVE_SLOT": "Invalid save slot %d",
         "OSD_KILL": "Bye-bye!",
         "OSD_KILL_ALL": "Poof! %d enemies gone!",
@@ -398,6 +399,8 @@
         "OSD_POS_SET_ROOM_FAIL": "Failed to teleport to room: %d",
         "OSD_SAVE_GAME": "Saved game to save slot %d",
         "OSD_SAVE_GAME_FAIL": "Cannot save the game in the current state",
+        "OSD_SOUND_AVAILABLE_SAMPLES": "Available sounds: %s",
+        "OSD_SOUND_PLAYING_SAMPLE": "Playing sound %d",
         "OSD_UNKNOWN_COMMAND": "Unknown command: %s",
     },
 }

docs/progress.txt

@@ -616,7 +616,7 @@ typedef struct __unaligned {
     uint8_t buffer[6272];
 } SAVEGAME_INFO;
 
-typedef struct __unaligned {
+typedef struct __unaligned { // decompiled
     uint16_t idx;
     int16_t box;
     uint8_t pit_room;
@@ -883,20 +883,20 @@ typedef struct { // decompiled
     int16_t link_frame_num;
 } ANIM_RANGE;
 
-typedef struct __unaligned {
+typedef struct __unaligned { // decompiled
     int16_t room;
     int16_t x;
     int16_t y;
     int16_t z;
     XYZ_16 vertex[4];
 } DOOR_INFO;
 
-typedef struct __unaligned {
+typedef struct __unaligned { // decompiled
     int16_t count;
     DOOR_INFO door[];
 } DOOR_INFOS;
 
-typedef struct __unaligned {
+typedef struct __unaligned { // decompiled
     int32_t x;
     int32_t y;
     int32_t z;
@@ -906,7 +906,7 @@ typedef struct __unaligned {
     int32_t falloff2;
 } LIGHT_INFO;
 
-typedef struct __unaligned {
+typedef struct __unaligned { // decompiled
     int32_t x;
     int32_t y;
     int32_t z;
@@ -929,7 +929,7 @@ typedef struct __unaligned {
     int16_t block;
 } DOORPOS_DATA;
 
-typedef struct __unaligned {
+typedef struct __unaligned { // decompiled
     int16_t *data;
     DOOR_INFOS *doors;
     SECTOR_INFO *sector;
@@ -1645,7 +1645,7 @@ typedef enum { // decompiled
     IF_KILLED    = 0x8000,
 } ITEM_FLAG;
 
-typedef enum {
+typedef enum { // decompiled
     IS_INACTIVE    = 0,
     IS_ACTIVE      = 1,
     IS_DEACTIVATED = 2,

meson.build

@@ -91,15 +91,10 @@ dll_sources = [
   'src/game/camera.c',
   'src/game/clock.c',
   'src/game/collide.c',
-  'src/game/console/cmd/end_level.c',
-  'src/game/console/cmd/exit_game.c',
-  'src/game/console/cmd/exit_to_title.c',
   'src/game/console/cmd/flipmap.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/cmd/save_game.c',
-  'src/game/console/cmd/teleport.c',
   'src/game/console/common.c',
   'src/game/console/setup.c',
   'src/game/creature.c',

src/game/console/cmd/flipmap.c

@@ -7,9 +7,9 @@
 
 #include <libtrx/strings.h>
 
-static COMMAND_RESULT M_Entrypoint(const char *args);
+static COMMAND_RESULT M_Entrypoint(const COMMAND_CONTEXT *ctx);
 
-static COMMAND_RESULT M_Entrypoint(const char *const args)
+static COMMAND_RESULT M_Entrypoint(const COMMAND_CONTEXT *const ctx)
 {
     if (g_GameInfo.current_level.type == GFL_TITLE
         || g_GameInfo.current_level.type == GFL_DEMO
@@ -18,9 +18,9 @@ static COMMAND_RESULT M_Entrypoint(const char *const args)
     }
 
     bool new_state;
-    if (String_Equivalent(args, "")) {
+    if (String_Equivalent(ctx->args, "")) {
         new_state = !g_FlipStatus;
-    } else if (!String_ParseBool(args, &new_state)) {
+    } else if (!String_ParseBool(ctx->args, &new_state)) {
         return CR_BAD_INVOCATION;
     }
 

src/game/console/cmd/load_game.c

@@ -5,12 +5,12 @@
 
 #include <libtrx/strings.h>
 
-static COMMAND_RESULT M_Entrypoint(const char *args);
+static COMMAND_RESULT M_Entrypoint(const COMMAND_CONTEXT *ctx);
 
-static COMMAND_RESULT M_Entrypoint(const char *const args)
+static COMMAND_RESULT M_Entrypoint(const COMMAND_CONTEXT *const ctx)
 {
     int32_t slot_num;
-    if (!String_ParseInteger(args, &slot_num)) {
+    if (!String_ParseInteger(ctx->args, &slot_num)) {
         return CR_BAD_INVOCATION;
     }
 

src/game/console/cmd/play_level.c

@@ -7,29 +7,29 @@
 
 #include <stdio.h>
 
-static COMMAND_RESULT M_Entrypoint(const char *args);
+static COMMAND_RESULT M_Entrypoint(const COMMAND_CONTEXT *ctx);
 
-static COMMAND_RESULT M_Entrypoint(const char *const args)
+static COMMAND_RESULT M_Entrypoint(const COMMAND_CONTEXT *const ctx)
 {
     int32_t level_to_load = -1;
 
     if (level_to_load == -1) {
         int32_t num = 0;
-        if (sscanf(args, "%d", &num) == 1) {
+        if (sscanf(ctx->args, "%d", &num) == 1) {
             level_to_load = num;
         }
     }
 
-    if (level_to_load == -1 && strlen(args) >= 2) {
+    if (level_to_load == -1 && strlen(ctx->args) >= 2) {
         for (int i = 0; i < g_GameFlow.num_levels; i++) {
-            if (String_CaseSubstring(g_GF_LevelNames[i], args) != NULL) {
+            if (String_CaseSubstring(g_GF_LevelNames[i], ctx->args) != NULL) {
                 level_to_load = i;
                 break;
             }
         }
     }
 
-    if (level_to_load == -1 && String_Equivalent(args, "gym")) {
+    if (level_to_load == -1 && String_Equivalent(ctx->args, "gym")) {
         level_to_load = LV_GYM;
     }
 

src/game/console/cmd/save_game.c

@@ -8,12 +8,12 @@
 
 #include <libtrx/strings.h>
 
-static COMMAND_RESULT M_Entrypoint(const char *args);
+static COMMAND_RESULT M_Entrypoint(const COMMAND_CONTEXT *ctx);
 
-static COMMAND_RESULT M_Entrypoint(const char *const args)
+static COMMAND_RESULT M_Entrypoint(const COMMAND_CONTEXT *const ctx)
 {
     int32_t slot_num;
-    if (!String_ParseInteger(args, &slot_num)) {
+    if (!String_ParseInteger(ctx->args, &slot_num)) {
         return CR_BAD_INVOCATION;
     }