Try to remove malloc from LevelEditor

[nothing.git] / src / game / level / level_editor / undo_history.c

diff --git a/src/game/level/level_editor/undo_history.c b/src/game/level/level_editor/undo_history.c
index 7a51aaba9e62a87d5643bd631e5ca252b1e9b03d..f1e933ffd5bc6b267b99484ee770a05851444c61 100644 (file)
--- a/src/game/level/level_editor/undo_history.c
+++ b/src/game/level/level_editor/undo_history.c
@@ -4,13 +4,26 @@
 #include <SDL.h>
 
 #include "system/nth_alloc.h"
-#include "system/lt.h"
 #include "system/stacktrace.h"
 #include "undo_history.h"
+#include "config.h"
 
 typedef struct {
     RevertAction revert;
-} HistoryAction;
+    void *context_data;
+    size_t context_data_size;
+} HistoryItem;
+
+UndoHistory *create_undo_history_from_memory(Memory *memory)
+{
+    UndoHistory *result = memory_alloc(memory, sizeof(UndoHistory));
+    result->actions = create_ring_buffer_from_buffer(
+        memory,
+        sizeof(HistoryItem),
+        UNDO_HISTORY_CAPACITY);
+    result->memory = memory;
+    return result;
+}
 
 void undo_history_push(UndoHistory *undo_history,
                        RevertAction revert,
@@ -19,26 +32,32 @@ void undo_history_push(UndoHistory *undo_history,
 {
     trace_assert(undo_history);
 
-    HistoryAction action = {
+    // TODO: undo_history_push kinda leaks the memory
+    HistoryItem item = {
         .revert = revert,
+        .context_data = memory_alloc(undo_history->memory, context_data_size),
+        .context_data_size = context_data_size
     };
-
-    stack_push(&undo_history->actions, context_data, context_data_size);
-    stack_push(&undo_history->actions, &action, sizeof(action));
+    memcpy(item.context_data, context_data, context_data_size);
+    ring_buffer_push(&undo_history->actions, &item);
 }
 
 void undo_history_pop(UndoHistory *undo_history)
 {
     trace_assert(undo_history);
 
-    if (stack_empty(&undo_history->actions) > 0) {
-        HistoryAction action = *(HistoryAction *)stack_top_element(&undo_history->actions);
-        stack_pop(&undo_history->actions);
+    if (undo_history->actions.count > 0) {
+        HistoryItem *item = ring_buffer_top(&undo_history->actions);
+        item->revert(item->context_data, item->context_data_size);
+        ring_buffer_pop(&undo_history->actions);
+    }
+}
 
-        size_t context_size = stack_top_size(&undo_history->actions);
-        void *context = stack_top_element(&undo_history->actions);
+void undo_history_clean(UndoHistory *undo_history)
+{
+    trace_assert(undo_history);
 
-        action.revert(context, context_size);
-        stack_pop(&undo_history->actions);
+    while (undo_history->actions.count) {
+        ring_buffer_pop(&undo_history->actions);
     }
 }