memory: move to libtrx

.github/workflows/build_docker.yml

@@ -24,6 +24,8 @@ jobs:
 
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          submodules: 'true'
 
       - name: Build Docker image (${{ matrix.platform }})
         run: |

.github/workflows/build_macos.yml

@@ -44,6 +44,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
+          submodules: 'true'
           fetch-depth: 0
 
       - name: Extend PATH for MacPorts

.github/workflows/lint.yml

@@ -12,6 +12,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
+          submodules: 'true'
           fetch-depth: 0
 
       - name: Check JSON files validity

.github/workflows/release.yml

@@ -81,6 +81,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
+          submodules: 'true'
           fetch-depth: 0
 
       - name: Package asset (${{ matrix.platform }})
@@ -119,6 +120,7 @@ jobs:
       - name: "Checkout code"
         uses: actions/checkout@v4
         with:
+          submodules: 'true'
           fetch-depth: 0
 
       - name: "Download built game assets"

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "libtrx"]
+	path = subprojects/libtrx
+	url = git@github.com:LostArtefacts/libtrx.git

meson.build

@@ -1,10 +1,11 @@
-project('TR1X', ['c'],
+project('TR1X', 'c',
   default_options: [
     'c_std=c11',
     'warning_level=2',
   ],
 )
 
+dep_trx = subproject('libtrx')
 c_compiler = meson.get_compiler('c')
 
 build_opts = [
@@ -272,7 +273,6 @@ sources = [
   'src/math/math.c',
   'src/math/math_misc.c',
   'src/math/matrix.c',
-  'src/memory.c',
   'src/specific/s_audio.c',
   'src/specific/s_audio_sample.c',
   'src/specific/s_audio_stream.c',
@@ -328,6 +328,7 @@ executable(
   sources,
   include_directories: ['src/'],
   dependencies: dependencies,
+  link_with: dep_trx.get_variable('libtrx'),
   link_args: link_args,
   gui_app: true,
   install: true,

src/config.c

@@ -12,7 +12,7 @@
 #include "json/json_parse.h"
 #include "json/json_write.h"
 #include "log.h"
-#include "memory.h"
+#include "shared/memory.h"
 #include "util.h"
 
 #include <stdio.h>

src/filesystem.c

@@ -1,7 +1,7 @@
 #include "filesystem.h"
 
 #include "log.h"
-#include "memory.h"
+#include "shared/memory.h"
 #include "specific/s_filesystem.h"
 
 #include <stdio.h>

src/game/console_cmd.c

@@ -22,7 +22,7 @@
 #include "global/types.h"
 #include "global/vars.h"
 #include "math/math.h"
-#include "memory.h"
+#include "shared/memory.h"
 #include "strings.h"
 #include "util.h"
 

src/game/fmv.c

@@ -3,7 +3,7 @@
 #include "filesystem.h"
 #include "game/music.h"
 #include "game/sound.h"
-#include "memory.h"
+#include "shared/memory.h"
 #include "specific/s_fmv.h"
 
 #include <stddef.h>

src/game/game_string.c

@@ -1,5 +1,5 @@
 #include "game_string.h"
-#include "memory.h"
+#include "shared/memory.h"
 #include "util.h"
 
 #include <assert.h>

src/game/gamebuf.c

@@ -1,7 +1,7 @@
 #include "game/gamebuf.h"
 
 #include "game/shell.h"
-#include "memory.h"
+#include "shared/memory.h"
 
 #include <stddef.h>
 

src/game/gameflow.c

@@ -19,7 +19,7 @@
 #include "json/json_base.h"
 #include "json/json_parse.h"
 #include "log.h"
-#include "memory.h"
+#include "shared/memory.h"
 
 #include <string.h>
 

src/game/inject.c

@@ -9,7 +9,7 @@
 #include "global/vars.h"
 #include "items.h"
 #include "log.h"
-#include "memory.h"
+#include "shared/memory.h"
 #include "util.h"
 
 #include <assert.h>

src/game/level.c

@@ -25,7 +25,7 @@
 #include "global/types.h"
 #include "global/vars.h"
 #include "log.h"
-#include "memory.h"
+#include "shared/memory.h"
 
 #include <assert.h>
 #include <stdio.h>

src/game/music.c

@@ -6,7 +6,7 @@
 #include "game/sound.h"
 #include "global/vars.h"
 #include "log.h"
-#include "memory.h"
+#include "shared/memory.h"
 #include "specific/s_audio.h"
 
 #include <stdio.h>

src/game/objects/names.c

@@ -3,7 +3,7 @@
 #include "game/inventory.h"
 #include "game/inventory/inventory_vars.h"
 #include "game/objects/common.h"
-#include "memory.h"
+#include "shared/memory.h"
 #include "strings.h"
 
 #include <string.h>

src/game/option/option_passport.c

@@ -12,7 +12,7 @@
 #include "game/text.h"
 #include "global/const.h"
 #include "global/vars.h"
-#include "memory.h"
+#include "shared/memory.h"
 
 #include <stdbool.h>
 #include <stddef.h>

src/game/output.c

@@ -14,7 +14,7 @@
 #include "math/math.h"
 #include "math/math_misc.h"
 #include "math/matrix.h"
-#include "memory.h"
+#include "shared/memory.h"
 #include "specific/s_output.h"
 #include "specific/s_shell.h"
 #include "util.h"

src/game/packer.c

@@ -4,7 +4,7 @@
 #include "global/types.h"
 #include "global/vars.h"
 #include "log.h"
-#include "memory.h"
+#include "shared/memory.h"
 #include "util.h"
 
 #include <stddef.h>

src/game/picture.c

@@ -1,7 +1,7 @@
 #include "game/picture.h"
 
 #include "filesystem.h"
-#include "memory.h"
+#include "shared/memory.h"
 #include "specific/s_picture.h"
 
 #include <assert.h>

src/game/savegame/savegame.c

@@ -20,7 +20,7 @@
 #include "global/const.h"
 #include "global/types.h"
 #include "global/vars.h"
-#include "memory.h"
+#include "shared/memory.h"
 
 #include <assert.h>
 #include <stdbool.h>

src/game/savegame/savegame_bson.c

@@ -17,7 +17,7 @@
 #include "json/bson_write.h"
 #include "json/json_base.h"
 #include "log.h"
-#include "memory.h"
+#include "shared/memory.h"
 #include "util.h"
 
 #include <assert.h>

src/game/savegame/savegame_legacy.c

@@ -13,7 +13,7 @@
 #include "global/const.h"
 #include "global/vars.h"
 #include "log.h"
-#include "memory.h"
+#include "shared/memory.h"
 #include "util.h"
 
 #include <assert.h>

src/game/shell.c

@@ -23,7 +23,7 @@
 #include "global/types.h"
 #include "global/vars.h"
 #include "log.h"
-#include "memory.h"
+#include "shared/memory.h"
 #include "specific/s_shell.h"
 
 #include <stdarg.h>

src/gfx/2d/2d_surface.c

@@ -3,7 +3,7 @@
 #include "gfx/blitter.h"
 #include "gfx/context.h"
 #include "log.h"
-#include "memory.h"
+#include "shared/memory.h"
 
 #include <string.h>
 

src/gfx/3d/vertex_stream.c

@@ -3,7 +3,7 @@
 #include "gfx/gl/gl_core_3_3.h"
 #include "gfx/gl/utils.h"
 #include "log.h"
-#include "memory.h"
+#include "shared/memory.h"
 
 static const GLenum GL_PRIM_MODES[] = {
     GL_LINES, // GFX_3D_PRIM_LINE

src/gfx/context.c

@@ -5,7 +5,7 @@
 #include "gfx/gl/utils.h"
 #include "gfx/screenshot.h"
 #include "log.h"
-#include "memory.h"
+#include "shared/memory.h"
 
 #include <SDL2/SDL_video.h>
 #include <string.h>

src/gfx/gl/program.c

@@ -4,7 +4,7 @@
 #include "game/shell.h"
 #include "gfx/gl/utils.h"
 #include "log.h"
-#include "memory.h"
+#include "shared/memory.h"
 
 #include <assert.h>
 #include <stddef.h>

src/gfx/gl/texture.c

@@ -1,7 +1,7 @@
 #include "gfx/gl/texture.h"
 
 #include "gfx/gl/utils.h"
-#include "memory.h"
+#include "shared/memory.h"
 
 #include <assert.h>
 

src/gfx/screenshot.c

@@ -2,7 +2,7 @@
 
 #include "game/picture.h"
 #include "global/types.h"
-#include "memory.h"
+#include "shared/memory.h"
 
 #include <assert.h>
 #include <string.h>

src/json/bson_parse.c

@@ -2,7 +2,7 @@
 
 #include "json/json_base.h"
 #include "log.h"
-#include "memory.h"
+#include "shared/memory.h"
 
 #include <assert.h>
 #include <stdbool.h>

src/json/bson_write.c

@@ -2,7 +2,7 @@
 
 #include "json/json_base.h"
 #include "log.h"
-#include "memory.h"
+#include "shared/memory.h"
 
 #include <assert.h>
 #include <float.h>

src/json/json_base.c

@@ -1,6 +1,6 @@
 #include "json/json_base.h"
 
-#include "memory.h"
+#include "shared/memory.h"
 
 #include <inttypes.h>
 #include <stdio.h>

src/json/json_parse.c

@@ -1,7 +1,7 @@
 #include "json/json_parse.h"
 
 #include "json/json_base.h"
-#include "memory.h"
+#include "shared/memory.h"
 
 struct json_parse_state_s {
     const char *src;

src/json/json_write.c

@@ -1,7 +1,7 @@
 #include "json/json_write.h"
 
 #include "json/json_base.h"
-#include "memory.h"
+#include "shared/memory.h"
 
 static int json_write_minified_get_value_size(
     const struct json_value_s *value, size_t *size);

src/log.c

@@ -1,7 +1,7 @@
 #include "log.h"
 
 #include "filesystem.h"
-#include "memory.h"
+#include "shared/memory.h"
 #include "specific/s_log.h"
 
 #include <stdarg.h>

src/memory.c

@@ -1,50 +0,0 @@
-#include "memory.h"
-
-#include "game/shell.h"
-
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-
-void *Memory_Alloc(size_t size)
-{
-    void *result = malloc(size);
-    if (!result) {
-        Shell_ExitSystem("ERROR: Could not allocate enough memory");
-    }
-    memset(result, 0, size);
-    return result;
-}
-
-void *Memory_Realloc(void *memory, size_t size)
-{
-    void *result = realloc(memory, size);
-    if (!result) {
-        Shell_ExitSystem("ERROR: Could not allocate enough memory");
-    }
-    return result;
-}
-
-void Memory_Free(void *memory)
-{
-    if (memory) {
-        free(memory);
-    }
-}
-
-void Memory_FreePointer(void *arg)
-{
-    assert(arg);
-    void *memory;
-    memcpy(&memory, arg, sizeof(void *));
-    memcpy(arg, &(void *) { NULL }, sizeof(void *));
-    Memory_Free(memory);
-}
-
-char *Memory_DupStr(const char *string)
-{
-    assert(string);
-    char *memory = Memory_Alloc(strlen(string) + 1);
-    strcpy(memory, string);
-    return memory;
-}

src/memory.h

@@ -1,37 +0,0 @@
-#pragma once
-
-// Basic memory utilities that exit the game in case the system runs out of
-// memory.
-
-#include <stddef.h>
-
-// Allocate n bytes. In case the memory allocation fails, shows an error to the
-// user and exits the application. The allocated memory is filled with zeros.
-void *Memory_Alloc(size_t size);
-
-// Reallocate existing memory to n bytes, returning an address to the
-// reallocated memory. In case the memory allocation fails, shows an error to
-// the user and exits the application. All pointers to the old memory address
-// become invalid. Preserves the previous memory contents. If the memory is
-// NULL, the function acts like Memory_Alloc.
-void *Memory_Realloc(void *memory, size_t size);
-
-// Frees the memory associated with a given address. If the memory is NULL, the
-// function is a no-op.
-void Memory_Free(void *memory);
-
-// Frees the memory associated with a given pointer and sets it to NULL. The
-// user is expected to pass a pointer of their variable like so:
-//
-// char *mem = Memory_Alloc(10);
-// Memory_FreePointer(&mem);
-// (mem is now NULL)
-//
-// Giving a NULL to this function is a fatal error. Passing mem directly is
-// also an error.
-void Memory_FreePointer(void *memory);
-
-// Duplicates a string. In case the memory allocation fails, shows an error to
-// the user and exits the application. The string must be NULL-terminated.
-// Giving a NULL to this function is a fatal error.
-char *Memory_DupStr(const char *string);

src/shared

@@ -0,0 +1 @@
+../subprojects/libtrx/src/

src/specific/s_audio.c

@@ -2,7 +2,7 @@
 #include "specific/s_audio.h"
 
 #include "log.h"
-#include "memory.h"
+#include "shared/memory.h"
 
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_error.h>

src/specific/s_audio_sample.c

@@ -3,7 +3,7 @@
 
 #include "game/shell.h"
 #include "log.h"
-#include "memory.h"
+#include "shared/memory.h"
 
 #include <SDL2/SDL_audio.h>
 #include <errno.h>

src/specific/s_audio_stream.c

@@ -3,7 +3,7 @@
 
 #include "filesystem.h"
 #include "log.h"
-#include "memory.h"
+#include "shared/memory.h"
 
 #include <SDL2/SDL_audio.h>
 #include <SDL2/SDL_error.h>

src/specific/s_filesystem.c

@@ -1,7 +1,7 @@
 #include "specific/s_filesystem.h"
 
 #include "log.h"
-#include "memory.h"
+#include "shared/memory.h"
 #include "strings.h"
 
 #include <SDL2/SDL_filesystem.h>

src/specific/s_fmv.c

@@ -33,7 +33,7 @@
 #include "gfx/context.h"
 #include "global/types.h"
 #include "log.h"
-#include "memory.h"
+#include "shared/memory.h"
 #include "specific/s_audio.h"
 #include "specific/s_output.h"
 #include "specific/s_shell.h"

src/specific/s_picture.c

@@ -3,7 +3,7 @@
 #include "filesystem.h"
 #include "game/picture.h"
 #include "log.h"
-#include "memory.h"
+#include "shared/memory.h"
 
 #include <assert.h>
 #include <errno.h>

src/specific/s_shell.c

@@ -9,7 +9,7 @@
 #include "game/shell.h"
 #include "game/sound.h"
 #include "log.h"
-#include "memory.h"
+#include "shared/memory.h"
 
 #define SDL_MAIN_HANDLED
 

subprojects/libtrx

@@ -0,0 +1 @@
+Subproject commit b271b45a5575da9d45478b6ed71aa1208fd350d0