Bring the unfinished .R files into line with the current conventions.

[sgt/puzzles] / solo.c

diff --git a/solo.c b/solo.c
index 1879a98..6ccf1ad 100644 (file)
--- a/solo.c
+++ b/solo.c
@@ -110,7 +110,7 @@ typedef unsigned char digit;
 #define PREFERRED_TILE_SIZE 32
 #define TILE_SIZE (ds->tilesize)
 #define BORDER (TILE_SIZE / 2)
-#define GRIDEXTRA (TILE_SIZE / 32)
+#define GRIDEXTRA max((TILE_SIZE / 32),1)
 
 #define FLASH_TIME 0.4F
 
@@ -2779,10 +2779,10 @@ static game_state *new_game(midend *me, game_params *params, char *desc)
 
            if (*desc == '_')
                c = 0;
-           else if (*desc >= 'a' && *desc <= 'z')
+           else {
+                assert(*desc >= 'a' && *desc <= 'z');
                c = *desc - 'a' + 1;
-           else
-               assert(!"Shouldn't get here");
+            }
            desc++;
 
            adv = (c != 25);           /* 'z' is a special case */
@@ -3162,6 +3162,11 @@ static char *grid_text_format(int cr, struct block_structure *blocks,
     return ret;
 }
 
+static int game_can_format_as_text_now(game_params *params)
+{
+    return TRUE;
+}
+
 static char *game_text_format(game_state *state)
 {
     return grid_text_format(state->cr, state->blocks, state->xtype,
@@ -3935,7 +3940,7 @@ const struct game thegame = {
     dup_game,
     free_game,
     TRUE, solve_game,
-    TRUE, game_text_format,
+    TRUE, game_can_format_as_text_now, game_text_format,
     new_ui,
     free_ui,
     encode_ui,