(#1108) add development ding

[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 32f9c6bd1ecf820d99e2893a6295f65928ddba08..5aba786d37b5593df6a3f43c11f4636255c7fb99 100644 (file)
--- a/src/game/level/level_editor/undo_history.c
+++ b/src/game/level/level_editor/undo_history.c
@@ -7,81 +7,24 @@
 #include "system/lt.h"
 #include "system/stacktrace.h"
 #include "undo_history.h"
-#include "stack.h"
-
-struct UndoHistory
-{
-    Lt *lt;
-    Stack actions;
-};
-
-
 
 typedef struct {
-    void *layer;
-    Context context;
     RevertAction revert;
 } Action;
 
-static inline
-Action create_action(void *layer, RevertAction revert,
-                     void *context_data,
-                     size_t context_data_size)
-{
-    trace_assert(layer);
-    trace_assert(revert);
-    trace_assert(context_data_size < CONTEXT_SIZE);
-
-    Action action = {
-        .layer = layer,
-        .revert = revert
-    };
-
-    if (context_data) {
-        memcpy(action.context.data, context_data, context_data_size);
-    }
-
-    return action;
-}
-
-UndoHistory *create_undo_history(void)
-{
-    Lt *lt = create_lt();
-
-    UndoHistory *undo_history = PUSH_LT(
-        lt,
-        nth_calloc(1, sizeof(UndoHistory)),
-        free);
-    undo_history->lt = lt;
-
-    return undo_history;
-}
-
-void destroy_undo_history(UndoHistory *undo_history)
-{
-    trace_assert(undo_history);
-    destroy_stack(undo_history->actions);
-    RETURN_LT0(undo_history->lt);
-}
-
 void undo_history_push(UndoHistory *undo_history,
-                       void *layer,
                        RevertAction revert,
                        void *context_data,
                        size_t context_data_size)
 {
     trace_assert(undo_history);
 
-    Action action = create_action(
-        layer,
-        revert,
-        context_data,
-        context_data_size);
+    Action action = {
+        .revert = revert,
+    };
 
-    stack_push(
-        &undo_history->actions,
-        &action,
-        sizeof(action));
+    stack_push(&undo_history->actions, context_data, context_data_size);
+    stack_push(&undo_history->actions, &action, sizeof(action));
 }
 
 void undo_history_pop(UndoHistory *undo_history)
@@ -89,8 +32,13 @@ void undo_history_pop(UndoHistory *undo_history)
     trace_assert(undo_history);
 
     if (stack_empty(&undo_history->actions) > 0) {
-        Action *action = stack_top_element(&undo_history->actions);
-        action->revert(action->layer, action->context);
+        Action action = *(Action *)stack_top_element(&undo_history->actions);
+        stack_pop(&undo_history->actions);
+
+        size_t context_size = stack_top_size(&undo_history->actions);
+        void *context = stack_top_element(&undo_history->actions);
+
+        action.revert(context, context_size);
         stack_pop(&undo_history->actions);
     }
 }