cleanup of unnecessarily convoluted function call

[rocksndiamonds.git] / src / game_bd / bd_caveset.h

diff --git a/src/game_bd/bd_caveset.h b/src/game_bd/bd_caveset.h
index 79dc545f340b906cce9c758d7082e33d9fcf46f2..7cd23f660ec8ce1d55360c40f84275b051cc6af3 100644 (file)
--- a/src/game_bd/bd_caveset.h
+++ b/src/game_bd/bd_caveset.h
@@ -22,29 +22,31 @@
 
 typedef struct _gd_caveset_data
 {
-  GdString name;                /* Name of caveset */
-  GdString description;         /* Some words about the caveset */
-  GdString author;              /* Author */
-  GdString difficulty;          /* difficulty of the caveset, for info purposes */
-  GdString www;                 /* link to author's webpage */
-  GdString date;                /* date of creation */
-
-  char *story;                  /* story for the caves */
-  char *remark;                 /* notes about the game */
+  GdString name;                // Name of caveset
+  GdString description;         // Some words about the caveset
+  GdString author;              // Author
+  GdString difficulty;          // difficulty of the caveset, for info purposes
+  GdString www;                 // link to author's webpage
+  GdString date;                // date of creation
+
+  char *story;                  // story for the caves
+  char *remark;                 // notes about the game
     
-  char *title_screen;           /* base64-encoded title screen image */
-  char *title_screen_scroll;    /* scrolling background for title screen image */
+  char *title_screen;           // base64-encoded title screen image
+  char *title_screen_scroll;    // scrolling background for title screen image
 
-  GdString charset;             /* these are not used by gdash */
+  GdString charset;             // these are not used by gdash
   GdString fontset;
 
-  /* these are only for a game. */
-  int initial_lives;            /* initial lives at game start */
-  int maximum_lives;            /* maximum lives */
-  int bonus_life_score;         /* bonus life / number of points */
+  // these are only for a game.
+  int initial_lives;            // initial lives at game start
+  int maximum_lives;            // maximum lives
+  int bonus_life_score;         // bonus life / number of points
 
-  /* and this one the highscores */
+  // and this one the highscores
   GdHighScore highscore[GD_HIGHSCORE_NUM];
+
+  char *levelset_subdir;       // current level set identifier
 } GdCavesetData;
 
 extern const GdStructDescriptor gd_caveset_properties[];
@@ -57,16 +59,16 @@ extern int gd_caveset_last_selected_level;
 
 extern char *gd_caveset_extensions[];
 
-/* #included cavesets; configdir passed to look for .hsc file */
+// #included cavesets; configdir passed to look for .hsc file
 boolean gd_caveset_load_from_internal(int caveset, const char *configdir);
 const char **gd_caveset_get_internal_game_names(void);
 
-/* caveset load from file */
+// caveset load from file
 boolean gd_caveset_load_from_file(char *filename);
-/* caveset save to bdcff file */
+// caveset save to bdcff file
 boolean gd_caveset_save_to_file(const char *filename);
 
-/* misc caveset functions */
+// misc caveset functions
 int gd_caveset_count(void);
 void gd_caveset_clear(void);
 GdCave *gd_return_nth_cave(const int cave);
@@ -75,14 +77,14 @@ GdCave *gd_get_original_cave_from_caveset(const int cave);
 GdCave *gd_get_prepared_cave_from_caveset(const int cave, const int level);
 GdCave *gd_get_prepared_cave(const GdCave *cave, const int level);
 
-/* highscore in config directory */
+// highscore in config directory
 void gd_save_highscore(const char* directory);
 boolean gd_load_highscore(const char *directory);
 
 GdCavesetData *gd_caveset_data_new(void);
 void gd_caveset_data_free(GdCavesetData *data);
 
-/* check replays and optionally remove */
+// check replays and optionally remove
 int gd_cave_check_replays(GdCave *cave, boolean report, boolean remove, boolean repair);
 
 boolean gd_caveset_has_replays(void);