Minor bug fixes from James Harvey.

[originally from svn r8785]

5 files changed, 8 insertions, 7 deletions

diff --git a/blackbox.c b/blackbox.c
index 1d65ddc..7d5a77d 100644
--- a/blackbox.c
+++ b/blackbox.c
@@ -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);
 
         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;
 
             if (reflect || hit)
diff --git a/bridges.c b/bridges.c
index 64501ef..5bb73f4 100644
--- a/bridges.c
+++ b/bridges.c
@@ -2479,7 +2479,7 @@ static void dsf_debug_draw(drawing *dr,
 #ifdef DRAW_DSF
     int ts = TILE_SIZE/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)));
     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 bg = (v & G_CURSOR) ? COL_CURSOR :
         (v & G_MARK) ? COL_MARK : COL_BACKGROUND;
-    char str[10];
+    char str[32];
 
 #ifdef DRAW_GRID
     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 */
     for (i = 0; i < state->n_islands; i++) {
-        char str[10];
+        char str[32];
         struct island *is = &state->islands[i];
         grid = GRID(state, is->x, is->y);
         cx = COORD(is->x) + ts/2;
diff --git a/lightup.c b/lightup.c
index 75a6219..20e9cec 100644
--- a/lightup.c
+++ b/lightup.c
@@ -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);
         if (ds_flags & DF_NUMBERED) {
             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
              * 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) {
 		draw_rect(dr, dx, dy, TILE_SIZE, TILE_SIZE, ink);
 		if (ds_flags & DF_NUMBERED) {
-		    char str[10];
+		    char str[32];
 		    sprintf(str, "%d", GRID(state, lights, x, y));
 		    draw_text(dr, dx + TILE_SIZE/2, dy + TILE_SIZE/2,
 			      FONT_VARIABLE, TILE_SIZE*3/5,
diff --git a/loopy.c b/loopy.c
index afa362c..488b507 100644
--- a/loopy.c
+++ b/loopy.c
@@ -3609,7 +3609,7 @@ static void game_print(drawing *dr, game_state *state, int tilesize)
     game_drawstate ads, *ds = &ads;
     grid *g = state->game_grid;
 
-    game_set_size(dr, ds, NULL, tilesize);
+    ds->tilesize = tilesize;
 
     for (i = 0; i < g->num_dots; i++) {
         int x, y;
diff --git a/windows.c b/windows.c
index 6249d55..7fe11f3 100644
--- a/windows.c
+++ b/windows.c
@@ -3397,6 +3397,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 	DispatchMessage(&msg);
     }
 
+    DestroyWindow(fe->hwnd);
     cleanup_help();
 
     return msg.wParam;