Some more trimming

obsidian-level-maker · Jun 6, 2024 · b8d0479 · b8d0479
1 parent 10409e0
commit b8d0479
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 807 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -94,7 +94,6 @@ if(NOT CONSOLE_ONLY)
     source_files/obsidian_main/ui_module.cc
     source_files/obsidian_main/ui_widgets.cc
     source_files/obsidian_main/ui_window.cc
-    source_files/obsidian_main/vis_buffer.cc
   )
 else()
   add_executable(
@@ -129,7 +128,6 @@ else()
     source_files/obsidian_main/sys_xoshiro.cc
     source_files/obsidian_main/tx_forge.cc
     source_files/obsidian_main/tx_skies.cc
-    source_files/obsidian_main/vis_buffer.cc
   )
 endif()
 

diff --git a/source_files/obsidian_main/main.cc b/source_files/obsidian_main/main.cc
@@ -1915,9 +1915,6 @@ softrestart:;
                 main_action = MAIN_SOFT_RESTART;
             }
         }
-    } catch (const assert_fail_c &err) {
-        Main::FatalError(_("Sorry, an internal error occurred:\n%s"),
-                         err.GetMessage());
     } catch (std::exception &e) {
         Main::FatalError(_("An exception occurred: \n%s"), e.what());
     }

diff --git a/source_files/obsidian_main/sys_assert.cc b/source_files/obsidian_main/sys_assert.cc
@@ -22,27 +22,6 @@
 #include "headers.h"
 #include "main.h"
 
-assert_fail_c::assert_fail_c(const char *_msg) {
-    strncpy(message, _msg, sizeof(message));
-
-    message[sizeof(message) - 1] = 0;
-}
-
-assert_fail_c::~assert_fail_c() { /* nothing needed */
-}
-
-assert_fail_c::assert_fail_c(const assert_fail_c &other) {
-    strcpy(message, other.message);
-}
-
-assert_fail_c &assert_fail_c::operator=(const assert_fail_c &other) {
-    if (this != &other) {
-        strcpy(message, other.message);
-    }
-
-    return *this;
-}
-
 //----------------------------------------------------------------------------
 
 void AssertFail(const char *msg, ...) {
@@ -56,8 +35,6 @@ void AssertFail(const char *msg, ...) {
 
     buffer[MSG_BUF_LEN - 2] = 0;
 
-    // NO WORKY WITH LUA :( ---> throw assert_fail_c(buffer);
-
     Main::FatalError("Sorry, an internal error occurred.\n%s", buffer);
 }
 

diff --git a/source_files/obsidian_main/sys_assert.h b/source_files/obsidian_main/sys_assert.h
@@ -26,23 +26,6 @@
 #undef GetMessage
 #endif
 
-class assert_fail_c {
-   public:
-    assert_fail_c(const char *_msg);
-    assert_fail_c(const assert_fail_c &other);
-    ~assert_fail_c();
-
-   private:
-    static const int MSG_MAX = 200;
-
-    char message[MSG_MAX];
-
-   public:
-    const char *GetMessage() const { return message; }
-
-    assert_fail_c &operator=(const assert_fail_c &other);
-};
-
 // -------- the macros --------
 
 #ifdef NDEBUG

diff --git a/source_files/obsidian_main/sys_endian.h b/source_files/obsidian_main/sys_endian.h
@@ -113,26 +113,6 @@ static inline uint32_t UT_Swap32(uint32_t x) {
 #define BE_S16(X) ((int16_t)BE_U16((uint16_t)(X)))
 #define BE_S32(X) ((int32_t)BE_U32((uint32_t)(X)))
 
-// ---- floating point ----
-
-static inline float UT_SwapFloat(float x) {
-    union {
-        float f;
-        uint32_t u;
-    } in, out;
-    in.f = x;
-    out.u = UT_Swap32(in.u);
-    return out.f;
-}
-
-#if (UT_BYTEORDER == UT_LIL_ENDIAN)
-#define LE_Float32(X) (X)
-#define BE_Float32(X) UT_SwapFloat(X)
-#else
-#define LE_Float32(X) UT_SwapFloat(X)
-#define BE_Float32(X) (X)
-#endif
-
 #endif  // __SYS_ENDIAN_H__
 
 //--- editor settings ---

diff --git a/source_files/obsidian_main/sys_macro.h b/source_files/obsidian_main/sys_macro.h
@@ -68,19 +68,6 @@ constexpr T ABS(T a) {
 }
 #endif
 
-#ifndef SGN
-template <typename T>
-constexpr auto SGN(T x) {
-    if (x < 0) {
-        return -1;
-    }
-    if (x > 0) {
-        return 1;
-    }
-    return 0;
-}
-#endif
-
 #ifndef I_ROUND
 template <typename T>
 constexpr int I_ROUND(T x) {