Test coverage - Almost all of score.c

[open-adventure.git] / dungeon.c

diff --git a/dungeon.c b/dungeon.c
index dccda9e82f4a388045fa89f88ca0f81116e680ad..997b49ecff7b4b472b7aaa721b715f4c9b8626e0 100644 (file)
--- a/dungeon.c
+++ b/dungeon.c
@@ -14,6 +14,7 @@
 #define TRVSIZ 885
 #define TOKLEN 5
 #define HINTLEN 5
+#define HNTSIZ 20
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -51,12 +52,10 @@ long ATAB[TABSIZ + 1];
 long PLAC[NOBJECTS + 1];
 long FIXD[NOBJECTS + 1];
 long ACTSPK[VRBSIZ + 1];
-long HINTS[HNTSIZ + 1][HINTLEN];
-
 
 static bool is_set(long var, long position)
 {
-    long mask = 1l << position;
+    long mask = 1L << position;
     bool result = (var & mask) == mask;
     return (result);
 }
@@ -310,7 +309,7 @@ static void read_conditions(FILE* database)
         while ((loc = GETNUM(NULL)) != 0) {
             if (is_set(COND[loc], K))
                 BUG(LOCATION_HAS_CONDITION_BIT_BEING_SET_TWICE);
-            COND[loc] = COND[loc] + (1l << K);
+            COND[loc] = COND[loc] + (1L << K);
         }
     }
 }
@@ -325,7 +324,8 @@ static void read_hints(FILE* database)
         if (K <= 0 || K > HNTSIZ)
             BUG(TOO_MANY_HINTS);
         for (int I = 1; I <= 4; I++) {
-            HINTS[K][I] = GETNUM(NULL);
+           /* consume - actual arrqy-building now done in YAML. */
+            GETNUM(NULL);
         } /* end loop */
         HNTMAX = (HNTMAX > K ? HNTMAX : K);
     }
@@ -449,11 +449,6 @@ static int read_database(FILE* database)
  *  whether the abbreviated description is printed.  Counts modulo 5
  *  unless "LOOK" is used. */
 
-static void write_0d(FILE* header_file, long single, const char* varname)
-{
-    fprintf(header_file, "LOCATION long %s INITIALIZE(= %ld);\n", varname, single);
-}
-
 static void write_1d(FILE* header_file, long array[], long dim, const char* varname)
 {
     fprintf(header_file, "LOCATION long %s[] INITIALIZE(= {\n", varname);
@@ -468,19 +463,6 @@ static void write_1d(FILE* header_file, long array[], long dim, const char* varn
     fprintf(header_file, "\n});\n");
 }
 
-static void write_hints(FILE* header_file, long matrix[][HINTLEN], long dim1, long dim2, const char* varname)
-{
-    fprintf(header_file, "LOCATION long %s[][%ld] INITIALIZE(= {\n", varname, dim2);
-    for (int i = 0; i < dim1; ++i) {
-        fprintf(header_file, "  {");
-        for (int j = 0; j < dim2; ++j) {
-            fprintf(header_file, "%ld, ", matrix[i][j]);
-        }
-        fprintf(header_file, "},\n");
-    }
-    fprintf(header_file, "});\n");
-}
-
 static void write_file(FILE* header_file)
 {
     fprintf(header_file, "#ifndef DATABASE_H\n");
@@ -504,7 +486,6 @@ static void write_file(FILE* header_file)
     fprintf(header_file, "\n");
 
     // content variables
-    write_0d(header_file, HNTMAX, "HNTMAX");
     write_1d(header_file, OBJSND, NOBJECTS + 1, "OBJSND");
     write_1d(header_file, OBJTXT, NOBJECTS + 1, "OBJTXT");
     write_1d(header_file, COND, LOCSIZ + 1, "COND");
@@ -516,7 +497,6 @@ static void write_file(FILE* header_file)
     write_1d(header_file, PLAC, NOBJECTS + 1, "PLAC");
     write_1d(header_file, FIXD, NOBJECTS + 1, "FIXD");
     write_1d(header_file, ACTSPK, VRBSIZ + 1, "ACTSPK");
-    write_hints(header_file, HINTS, HNTSIZ + 1, 5, "HINTS");
 
     fprintf(header_file, "#undef LOCATION\n");
     fprintf(header_file, "#undef INITIALIZE\n");