more multiplayer preparations

src/game.c

@@ -31,6 +31,7 @@
 #include "main.h"
 #include "sample.h"
 #include "window.h"
+#include "multiplayer.h"
 #include "game.h"
 
 #define BAR_OFFSET_X (4 - 80)
@@ -137,7 +138,7 @@ static void show_explosion(uint16_t power) NONBANKED {
     }
 }
 
-int32_t game(void) NONBANKED {
+int32_t game(enum GAME_MODE mode) NONBANKED {
     snd_music_off();
     snd_note_off();
 
@@ -159,8 +160,10 @@ int32_t game(void) NONBANKED {
 
     obj_init();
 
-    if (!(conf_get()->debug_flags & DBG_NO_OBJ)) {
-        obj_spawn();
+    if (mode == GM_SINGLE) {
+        if (!(conf_get()->debug_flags & DBG_NO_OBJ)) {
+            obj_spawn();
+        }
     }
 
     win_init(0);
@@ -176,6 +179,10 @@ int32_t game(void) NONBANKED {
     while(1) {
         key_read();
 
+        if (mode != GM_SINGLE) {
+            mp_handle();
+        }
+
         enum ACCELERATION acc = 0;
         int32_t prev_score = score;
 

src/game.h

@@ -25,10 +25,14 @@
 #define HEALTH_MAX 0x1FF
 #define HEALTH_SHIFT 1
 
-// TODO ?
 #define SHOT_SPEED 42 //23
 #define MAX_TRAVEL 64 //128
 
-int32_t game(void);
+enum GAME_MODE {
+    GM_SINGLE = 0,
+    GM_MULTI,
+};
+
+int32_t game(enum GAME_MODE mode);
 
 #endif // __GAME_H__

src/main.c

@@ -593,7 +593,7 @@ void main(void) NONBANKED {
     initarand(seed);
 
     while (1) {
-        int32_t score = game();
+        int32_t score = game(GM_SINGLE);
 
         if ((!(conf_get()->debug_flags & DBG_GOD_MODE)) && (score != 0) && score_ranking(score)) {
             uint16_t name = ask_name(score);

src/multiplayer.c

@@ -38,6 +38,7 @@ enum mp_state {
 
 static enum mp_state state = 0;
 static uint16_t next_t = 0;
+static uint8_t our_turn = 0;
 
 uint8_t mp_connection_status = 0;
 
@@ -88,7 +89,8 @@ uint8_t mp_master_ready(void) BANKED {
 }
 
 void mp_master_start(void) BANKED {
-    game(); // TODO
+    our_turn = 1;
+    game(GM_MULTI);
     state = 0;
 }
 
@@ -139,6 +141,11 @@ uint8_t mp_slave_ready(void) BANKED {
 }
 
 void mp_slave_start(void) BANKED {
-    game(); // TODO
+    our_turn = 0;
+    game(GM_MULTI);
     state = 0;
 }
+
+void mp_handle(void) BANKED {
+
+}

src/multiplayer.h

@@ -25,9 +25,12 @@
 
 uint8_t mp_master_ready(void) BANKED;
 void mp_master_start(void) BANKED;
+
 uint8_t mp_slave_ready(void) BANKED;
 void mp_slave_start(void) BANKED;
 
+void mp_handle(void) BANKED;
+
 extern uint8_t mp_connection_status;
 
 #endif // __MULTIPLAYER_H__