moved level set info structure to game library layer
authorHolger Schemel <info@artsoft.org>
Tue, 28 Aug 2018 02:20:15 +0000 (04:20 +0200)
committerHolger Schemel <info@artsoft.org>
Tue, 28 Aug 2018 02:20:15 +0000 (04:20 +0200)
src/libgame/system.c
src/libgame/system.h
src/main.c
src/main.h

index cfd1f87..7321731 100644 (file)
@@ -45,6 +45,7 @@ LevelDirTree         *leveldir_first = NULL;
 LevelDirTree          *leveldir_current = NULL;
 int                    level_nr;
 
+struct LevelSetInfo    levelset;
 struct LevelStats      level_stats[MAX_LEVELS];
 
 DrawWindow            *window = NULL;
index 7c55049..76169ef 100644 (file)
@@ -1566,6 +1566,11 @@ struct MouseActionInfo
   int button_hint;
 };
 
+struct LevelSetInfo
+{
+  int music[MAX_LEVELS];
+};
+
 struct LevelStats
 {
   int played;
@@ -1595,6 +1600,7 @@ extern LevelDirTree              *leveldir_first;
 extern LevelDirTree           *leveldir_current;
 extern int                     level_nr;
 
+extern struct LevelSetInfo     levelset;
 extern struct LevelStats       level_stats[];
 
 extern DrawWindow             *window;
index 312cb2c..00d7a46 100644 (file)
@@ -133,7 +133,6 @@ int                 TimeFrames, TimePlayed, TimeLeft, TapeTime;
 
 boolean                        network_player_action_received = FALSE;
 
-struct LevelSetInfo    levelset;
 struct LevelInfo       level, level_template;
 struct PlayerInfo      stored_player[MAX_PLAYERS], *local_player = NULL;
 struct HiScore         highscore[MAX_SCORE_ENTRIES];
index 0f7f663..cea0249 100644 (file)
@@ -2966,11 +2966,6 @@ struct EnvelopeInfo
   char text[MAX_ENVELOPE_TEXT_LEN + 1];
 };
 
-struct LevelSetInfo
-{
-  int music[MAX_LEVELS];
-};
-
 struct LevelFileInfo
 {
   int nr;
@@ -3623,7 +3618,6 @@ extern boolean                    network_player_action_received;
 
 extern int                     graphics_action_mapping[];
 
-extern struct LevelSetInfo     levelset;
 extern struct LevelInfo                level, level_template;
 extern struct HiScore          highscore[];
 extern struct TapeInfo         tape;