Reorganize

alexbatalov · Mar 5, 2024 · 12546a7 · 12546a7
1 parent 11b2834
commit 12546a7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 26 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -264,7 +264,6 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
 target_sources(${EXECUTABLE_NAME} PUBLIC
     "src/audio_engine.cc"
     "src/audio_engine.h"
-    "src/endian.hpp"
     "src/fps_limiter.cc"
     "src/fps_limiter.h"
     "src/platform_compat.cc"

diff --git a/src/endian.hpp b/src/endian.hpp
diff --git a/src/movie_lib.cc b/src/movie_lib.cc
@@ -10,7 +10,6 @@
 #include <string.h>
 
 #include "audio_engine.h"
-#include "endian.hpp"
 #include "platform_compat.h"
 
 namespace fallout {
@@ -98,6 +97,16 @@ static int _MVE_sndDecompS16(unsigned short* a1, unsigned char* a2, int a3, int
 static void _nfPkConfig();
 static void _nfPkDecomp(unsigned char* buf, unsigned char* a2, int a3, int a4, int a5, int a6);
 
+constexpr static uint16_t LoadLE16(const uint8_t* b)
+{
+    return (b[1] << 8) | b[0];
+}
+
+constexpr static uint32_t LoadLE32(const uint8_t* b)
+{
+    return (b[3] << 24) | (b[2] << 16) | (b[1] << 8) | b[0];
+}
+
 // 0x51EBD8
 static int dword_51EBD8 = 0;