Merge pull request #831 from omf2097/adt/simplify-netplay

Simplify netplay and remove bugs
omf2097 · Feb 5, 2025 · 0225fcc · 0225fcc
2 parents fdc0c33 + 2de3152
commit 0225fcc
Show file tree

Hide file tree

Showing 21 changed files with 396 additions and 215 deletions.
diff --git a/src/console/console_cmd.c b/src/console/console_cmd.c
@@ -195,7 +195,7 @@ int console_cmd_stun(game_state *gs, int argc, char **argv) {
 
 int console_cmd_rein(game_state *gs, int argc, char **argv) {
     scene *sc = game_state_get_scene(gs);
-    if(is_arena(sc->id)) {
+    if(scene_is_arena(sc)) {
         arena_toggle_rein(sc);
         return 0;
     }

diff --git a/src/controller/ai_controller.c b/src/controller/ai_controller.c
@@ -2598,7 +2598,7 @@ int ai_controller_poll(controller *ctrl, ctrl_event **ev) {
     // Do not run AI while match is starting or ending
     // XXX this prevents the AI from doing scrap/destruction moves
     // XXX this could be fixed by providing a "scene changed" event
-    if(is_arena(game_state_get_scene(o->gs)->id) &&
+    if(scene_is_arena(game_state_get_scene(o->gs)) &&
        arena_get_state(game_state_get_scene(o->gs)) != ARENA_STATE_FIGHTING) {
 
         // null out selected move to fix the "AI not moving problem"

diff --git a/src/controller/controller.h b/src/controller/controller.h
@@ -15,8 +15,8 @@ enum
     ACT_UP = 0x08,
     ACT_DOWN = 0x10,
     ACT_LEFT = 0x20,
-    ACT_ESC = 0x40,
-    ACT_RIGHT = 0x80,
+    ACT_RIGHT = 0x40,
+    ACT_ESC = 0x80,
 
     ACT_Mask_Dirs = (ACT_UP | ACT_DOWN | ACT_LEFT | ACT_RIGHT),
 };

diff --git a/src/controller/keyboard.c b/src/controller/keyboard.c
@@ -1,5 +1,6 @@
 #include "controller/keyboard.h"
 #include "utils/allocator.h"
+#include "utils/log.h"
 #include <stdlib.h>
 
 void keyboard_free(controller *ctrl) {
@@ -13,6 +14,7 @@ static inline void keyboard_cmd(controller *ctrl, int action, ctrl_event **ev) {
 }
 
 int keyboard_poll(controller *ctrl, ctrl_event **ev) {
+    DEBUG("keyboard poll");
     keyboard *k = ctrl->data;
     ctrl->current = 0;
     const unsigned char *state = SDL_GetKeyboardState(NULL);