zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 16:05:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Minor bug fixes from James Harvey.

Browse Source 
[originally from svn r8785]
This commit is contained in:
Simon Tatham
2009-12-17 18:20:32 +00:00
parent 97477f0916
commit 8628a0630c
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
blackbox.c
View File

@ -1302,7 +1302,7 @@ static void draw_laser_tile(drawing *dr, game_state *gs, game_drawstate *ds,
draw_rect_outline(dr, dx, dy, TILE_SIZE, TILE_SIZE, COL_GRID); draw_rect_outline(dr, dx, dy, TILE_SIZE, TILE_SIZE, COL_GRID);
if (gs_tile &~ (LASER_WRONG | LASER_OMITTED | FLAG_CURSOR)) { if (gs_tile &~ (LASER_WRONG | LASER_OMITTED | FLAG_CURSOR)) {
char str[10]; char str[32];
int tcol = flash ? COL_FLASHTEXT : omitted ? COL_WRONG : COL_TEXT; int tcol = flash ? COL_FLASHTEXT : omitted ? COL_WRONG : COL_TEXT;
if (reflect || hit) if (reflect || hit)

6
bridges.c
View File

@ -2479,7 +2479,7 @@ static void dsf_debug_draw(drawing *dr,
#ifdef DRAW_DSF #ifdef DRAW_DSF
int ts = TILE_SIZE/2; int ts = TILE_SIZE/2;
int ox = COORD(x) + ts/2, oy = COORD(y) + ts/2; int ox = COORD(x) + ts/2, oy = COORD(y) + ts/2;
char str[10]; char str[32];
sprintf(str, "%d", dsf_canonify(state->solver->dsf, DINDEX(x,y))); sprintf(str, "%d", dsf_canonify(state->solver->dsf, DINDEX(x,y)));
draw_text(dr, ox, oy, FONT_VARIABLE, ts, draw_text(dr, ox, oy, FONT_VARIABLE, ts,
@ -2556,7 +2556,7 @@ static void island_redraw(drawing *dr,
int col = (v & G_ISSEL) ? COL_SELECTED : tcol; int col = (v & G_ISSEL) ? COL_SELECTED : tcol;
int bg = (v & G_CURSOR) ? COL_CURSOR : int bg = (v & G_CURSOR) ? COL_CURSOR :
(v & G_MARK) ? COL_MARK : COL_BACKGROUND; (v & G_MARK) ? COL_MARK : COL_BACKGROUND;
char str[10]; char str[32];
#ifdef DRAW_GRID #ifdef DRAW_GRID
draw_rect_outline(dr, COORD(is->x), COORD(is->y), draw_rect_outline(dr, COORD(is->x), COORD(is->y),
@ -2759,7 +2759,7 @@ static void game_print(drawing *dr, game_state *state, int ts)
/* Islands */ /* Islands */
for (i = 0; i < state->n_islands; i++) { for (i = 0; i < state->n_islands; i++) {
char str[10]; char str[32];
struct island *is = &state->islands[i]; struct island *is = &state->islands[i];
grid = GRID(state, is->x, is->y); grid = GRID(state, is->x, is->y);
cx = COORD(is->x) + ts/2; cx = COORD(is->x) + ts/2;

4
lightup.c
View File

@ -2066,7 +2066,7 @@ static void tile_redraw(drawing *dr, game_drawstate *ds, game_state *state,
draw_rect(dr, dx, dy, TILE_SIZE, TILE_SIZE, COL_BLACK); draw_rect(dr, dx, dy, TILE_SIZE, TILE_SIZE, COL_BLACK);
if (ds_flags & DF_NUMBERED) { if (ds_flags & DF_NUMBERED) {
int ccol = (ds_flags & DF_NUMBERWRONG) ? COL_ERROR : COL_LIGHT; int ccol = (ds_flags & DF_NUMBERWRONG) ? COL_ERROR : COL_LIGHT;
char str[10]; char str[32];
/* We know that this won't change over the course of the game /* We know that this won't change over the course of the game
* so it's OK to ignore this when calculating whether or not * so it's OK to ignore this when calculating whether or not
@ -2214,7 +2214,7 @@ static void game_print(drawing *dr, game_state *state, int tilesize)
if (ds_flags & DF_BLACK) { if (ds_flags & DF_BLACK) {
draw_rect(dr, dx, dy, TILE_SIZE, TILE_SIZE, ink); draw_rect(dr, dx, dy, TILE_SIZE, TILE_SIZE, ink);
if (ds_flags & DF_NUMBERED) { if (ds_flags & DF_NUMBERED) {
char str[10]; char str[32];
sprintf(str, "%d", GRID(state, lights, x, y)); sprintf(str, "%d", GRID(state, lights, x, y));
draw_text(dr, dx + TILE_SIZE/2, dy + TILE_SIZE/2, draw_text(dr, dx + TILE_SIZE/2, dy + TILE_SIZE/2,
FONT_VARIABLE, TILE_SIZE*3/5, FONT_VARIABLE, TILE_SIZE*3/5,

2
loopy.c
View File

@ -3609,7 +3609,7 @@ static void game_print(drawing *dr, game_state *state, int tilesize)
game_drawstate ads, *ds = &ads; game_drawstate ads, *ds = &ads;
grid *g = state->game_grid; grid *g = state->game_grid;
game_set_size(dr, ds, NULL, tilesize); ds->tilesize = tilesize;
for (i = 0; i < g->num_dots; i++) { for (i = 0; i < g->num_dots; i++) {
int x, y; int x, y;

1
windows.c
View File

@ -3397,6 +3397,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
DispatchMessage(&msg); DispatchMessage(&msg);
} }
DestroyWindow(fe->hwnd);
cleanup_help(); cleanup_help();
return msg.wParam; return msg.wParam;