Use game_set_size() to set up the temporary drawstate in

game_print(), wherever feasible. This fixes a specific bug in Loopy
(James H's new field ds->linewidth wasn't being set up, leading to
corrupted print output), but I've made the change in all affected
files because it also seems like a generally good idea to encourage
it for future games, to prevent other problems of this type.

There is one slight snag, which is that Map _can't_ do this because
its game_set_size() also initialises a blitter. I could fix this by
abstracting the common parts of Map's game_set_size() out into a
subfunction called by game_set_size() and also called directly by
game_print(); alternatively, I could introduce a means of
determining whether a `drawing *' was for screen or printing use.
Not sure which yet.

[originally from svn r6340]

diff --git a/dominosa.c b/dominosa.c
index 6d4e462a1a62dd36ce0e229ded1818c734930f87..f9d55d6658c62cd7526b7d328d6e823ac7465107 100644 (file)
--- a/dominosa.c
+++ b/dominosa.c
@@ -1711,7 +1711,7 @@ static void game_print(drawing *dr, game_state *state, int tilesize)
 
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     game_drawstate ads, *ds = &ads;
-    ads.tilesize = tilesize;
+    game_set_size(dr, ds, NULL, tilesize);
 
     c = print_mono_colour(dr, 1); assert(c == COL_BACKGROUND);
     c = print_mono_colour(dr, 0); assert(c == COL_TEXT);

diff --git a/lightup.c b/lightup.c
index b2c9b28fefc15983be3ba1528b85ce76cf00e63e..0d22131a3d6d7e31fb2b807dd0ca68fc4aae8136 100644 (file)
--- a/lightup.c
+++ b/lightup.c
@@ -2175,8 +2175,7 @@ static void game_print(drawing *dr, game_state *state, int tilesize)
 
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     game_drawstate ads, *ds = &ads;
-    ads.tilesize = tilesize;
-    ds->crad = 3*(tilesize-1)/8;
+    game_set_size(dr, ds, NULL, tilesize);
 
     /*
      * Border.

diff --git a/loopy.c b/loopy.c
index 342346516c1f1fb680fc78fc622c6ef3c892c8d5..6006c87ca47669170dc43dbab22de83b6f14a24a 100644 (file)
--- a/loopy.c
+++ b/loopy.c
@@ -2668,7 +2668,8 @@ static void game_print(drawing *dr, game_state *state, int tilesize)
     int ink = print_mono_colour(dr, 0);
     int x, y;
     game_drawstate ads, *ds = &ads;
-    ds->tilesize = tilesize;
+
+    game_set_size(dr, ds, NULL, tilesize);
 
     /*
      * Dots. I'll deliberately make the dots a bit wider than the

diff --git a/map.c b/map.c
index b06e6646e554feeeb009d6fe656817fac26686ae..6302ef785675b57cdd91ffc0937277e3f3d54423 100644 (file)
--- a/map.c
+++ b/map.c
@@ -2956,6 +2956,7 @@ static void game_print(drawing *dr, game_state *state, int tilesize)
 
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     struct { int tilesize; } ads, *ds = &ads;
+    /* We can't call game_set_size() here because we don't want a blitter */
     ads.tilesize = tilesize;
 
     ink = print_mono_colour(dr, 0);

diff --git a/net.c b/net.c
index 7ad8c562948df435820b79c7bacc164764090907..29a3a27839fd1a60e1b7762f6a435d650fdcc42c 100644 (file)
--- a/net.c
+++ b/net.c
@@ -2773,7 +2773,7 @@ static void game_print(drawing *dr, game_state *state, int tilesize)
 
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     game_drawstate ads, *ds = &ads;
-    ads.tilesize = tilesize;
+    game_set_size(dr, ds, NULL, tilesize);
 
     /*
      * Border.

diff --git a/pattern.c b/pattern.c
index 808b0a879d01d21bbce19973b361d7498a523457..dd664f561d1b704eb8e32284aaf3f5b5b597bbb0 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -1199,7 +1199,7 @@ static void game_print(drawing *dr, game_state *state, int tilesize)
 
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     game_drawstate ads, *ds = &ads;
-    ads.tilesize = tilesize;
+    game_set_size(dr, ds, NULL, tilesize);
 
     /*
      * Border.

diff --git a/rect.c b/rect.c
index b8b1fe6dce910ecb37f1ecc140aa757a3e3e24ab..9b780891f647090d5271100479a441d5079840d3 100644 (file)
--- a/rect.c
+++ b/rect.c
@@ -2791,7 +2791,7 @@ static void game_print(drawing *dr, game_state *state, int tilesize)
 
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     game_drawstate ads, *ds = &ads;
-    ads.tilesize = tilesize;
+    game_set_size(dr, ds, NULL, tilesize);
 
     /*
      * Border.

diff --git a/slant.c b/slant.c
index 6276c4187dd0fde3a4167042866185ae93aec61d..c7aa1695c014e8c6f3eb4130a583171a870f0e75 100644 (file)
--- a/slant.c
+++ b/slant.c
@@ -2001,7 +2001,7 @@ static void game_print(drawing *dr, game_state *state, int tilesize)
 
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     game_drawstate ads, *ds = &ads;
-    ads.tilesize = tilesize;
+    game_set_size(dr, ds, NULL, tilesize);
 
     /*
      * Border.

diff --git a/solo.c b/solo.c
index 05774a4d878599dea071963ae3b5307550e83fd4..cb9ac7f5c8bcd4cfde38f7e71aa6083eeae3a748 100644 (file)
--- a/solo.c
+++ b/solo.c
@@ -3009,7 +3009,7 @@ static void game_print(drawing *dr, game_state *state, int tilesize)
 
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     game_drawstate ads, *ds = &ads;
-    ads.tilesize = tilesize;
+    game_set_size(dr, ds, NULL, tilesize);
 
     /*
      * Border.