(#948) Get rid of event_handlers array

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

diff --git a/src/game/level/level_editor/rect_layer.c b/src/game/level/level_editor/rect_layer.c
index ede00bff6e464339be94a6f62983d21bffa13d5f..6442693d8b47b30e3159cb39cecf57b7582121e2 100644 (file)
--- a/src/game/level/level_editor/rect_layer.c
+++ b/src/game/level/level_editor/rect_layer.c
@@ -22,8 +22,6 @@ typedef enum {
     RECT_LAYER_RESIZE,
     RECT_LAYER_MOVE,
     RECT_LAYER_ID_RENAME,
-
-    RECT_LAYER_N
 } RectLayerState;
 
 struct RectLayer {
@@ -311,14 +309,6 @@ static int rect_layer_event_id_rename(RectLayer *layer, const SDL_Event *event,
     return 0;
 }
 
-static const EventHandler event_handlers[RECT_LAYER_N] = {
-    rect_layer_event_idle,
-    rect_layer_event_create,
-    rect_layer_event_resize,
-    rect_layer_event_move,
-    rect_layer_event_id_rename,
-};
-
 LayerPtr rect_layer_as_layer(RectLayer *rect_layer)
 {
     LayerPtr layer = {
@@ -516,7 +506,22 @@ int rect_layer_event(RectLayer *layer, const SDL_Event *event, const Camera *cam
         return 0;
     }
 
-    event_handlers[layer->state](layer, event, camera);
+    switch (layer->state) {
+    case RECT_LAYER_IDLE:
+        return rect_layer_event_idle(layer, event, camera);
+
+    case RECT_LAYER_CREATE:
+        return rect_layer_event_create(layer, event, camera);
+
+    case RECT_LAYER_RESIZE:
+        return rect_layer_event_resize(layer, event, camera);
+
+    case RECT_LAYER_MOVE:
+        return rect_layer_event_move(layer, event, camera);
+
+    case RECT_LAYER_ID_RENAME:
+        return rect_layer_event_id_rename(layer, event, camera);
+    }
 
     return 0;
 }