Rectangles is now actually playable, since I've used the new UI

[sgt/puzzles] / net.c

diff --git a/net.c b/net.c
index 8b74e7b..616609f 100644 (file)
--- a/net.c
+++ b/net.c
@@ -56,8 +56,8 @@ const int game_can_configure = TRUE;
 #define TILE_BORDER 1
 #define WINDOW_OFFSET 16
 
-#define ROTATE_TIME 0.1F
-#define FLASH_FRAME 0.05F
+#define ROTATE_TIME 0.13F
+#define FLASH_FRAME 0.07F
 
 enum {
     COL_BACKGROUND,
@@ -724,10 +724,19 @@ static unsigned char *compute_active(game_state *state)
     return active;
 }
 
+game_ui *new_ui(game_state *state)
+{
+    return NULL;
+}
+
+void free_ui(game_ui *ui)
+{
+}
+
 /* ----------------------------------------------------------------------
  * Process a move.
  */
-game_state *make_move(game_state *state, int x, int y, int button)
+game_state *make_move(game_state *state, game_ui *ui, int x, int y, int button)
 {
     game_state *ret;
     int tx, ty, orig;
@@ -751,8 +760,8 @@ game_state *make_move(game_state *state, int x, int y, int button)
     ty = y / TILE_SIZE;
     if (tx >= state->width || ty >= state->height)
        return NULL;
-    if (tx % TILE_SIZE >= TILE_SIZE - TILE_BORDER ||
-       ty % TILE_SIZE >= TILE_SIZE - TILE_BORDER)
+    if (x % TILE_SIZE >= TILE_SIZE - TILE_BORDER ||
+       y % TILE_SIZE >= TILE_SIZE - TILE_BORDER)
        return NULL;
 
     /*
@@ -1141,7 +1150,7 @@ static void draw_tile(frontend *fe, game_state *state, int x, int y, int tile,
 }
 
 void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
-                 game_state *state, float t, float ft)
+                 game_state *state, game_ui *ui, float t, float ft)
 {
     int x, y, tx, ty, frame;
     unsigned char *active;