Make g.coder->lvl_is_joined a boolean

Its value is only used as a boolean, so there's no real need to keep it
as a confusing int.

Shouldn't be a save-breaking change; it doesn't look like g.coder is
saved.

diff --git a/include/sp_lev.h b/include/sp_lev.h
index cdead3bd582e93b097a4b600756040462b87a459..3121d543c8fb22dbdd9a75a280cfc4546072c97c 100644 (file)
--- a/include/sp_lev.h
+++ b/include/sp_lev.h
@@ -91,7 +91,7 @@ struct sp_coder {
     struct mkroom *tmproomlist[MAX_NESTED_ROOMS + 1];
     boolean failed_room[MAX_NESTED_ROOMS + 1];
     int n_subroom;
-    int lvl_is_joined;
+    boolean lvl_is_joined;
     boolean check_inaccessibles;
     int allow_flips;
 };

diff --git a/src/sp_lev.c b/src/sp_lev.c
index 4b4e7841154cae7221d3a7ca85e07433b31f8c74..58026e76e98e4f3a3b984336b00698bd807b78b0 100755 (executable)
--- a/src/sp_lev.c
+++ b/src/sp_lev.c
@@ -6103,7 +6103,7 @@ sp_level_coder_init(void)
     coder->allow_flips = 3; /* allow flipping level horiz/vert */
     coder->croom = NULL;
     coder->n_subroom = 1;
-    coder->lvl_is_joined = 0;
+    coder->lvl_is_joined = FALSE;
     coder->room_stack = 0;
 
     splev_init_present = FALSE;

diff --git a/test/test_des.lua b/test/test_des.lua
index 9275d801ab1fa3dd054c45e7df12434c908bbe7c..fea2163263f58501fd393bec8d3710f26b6c98a6 100644 (file)
--- a/test/test_des.lua
+++ b/test/test_des.lua
@@ -61,7 +61,7 @@ function test_level_init()
    des.level_init({ style = "mines", fg = ".", bg = "}", joined = true });
 
    des.reset_level();
-   des.level_init({ style = "mines", fg = ".", bg = "L", smoothed = 1, joined = 1, lit = 0 });
+   des.level_init({ style = "mines", fg = ".", bg = "L", smoothed = true, joined = true, lit = 0 });
 
    des.reset_level();
    des.level_init({ style = "mines", fg = ".", bg = " ", smoothed = true, joined = true, walled = true });