~mdw
/
sgt
/
puzzles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Framework alteration: we now support a `game_ui' structure in
[sgt/puzzles]
/
net.c
diff --git
a/net.c
b/net.c
index
b3b0a39
..
616609f
100644
(file)
--- a/
net.c
+++ b/
net.c
@@
-724,10
+724,19
@@
static unsigned char *compute_active(game_state *state)
return active;
}
return active;
}
+game_ui *new_ui(game_state *state)
+{
+ return NULL;
+}
+
+void free_ui(game_ui *ui)
+{
+}
+
/* ----------------------------------------------------------------------
* Process a move.
*/
/* ----------------------------------------------------------------------
* 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;
{
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;
ty = y / TILE_SIZE;
if (tx >= state->width || ty >= state->height)
return NULL;
- if (
t
x % TILE_SIZE >= TILE_SIZE - TILE_BORDER ||
-
t
y % TILE_SIZE >= TILE_SIZE - TILE_BORDER)
+ if (x % TILE_SIZE >= TILE_SIZE - TILE_BORDER ||
+ y % TILE_SIZE >= TILE_SIZE - TILE_BORDER)
return NULL;
/*
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,
}
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;
{
int x, y, tx, ty, frame;
unsigned char *active;