moved level set info structure to game library layer

diff --git a/src/libgame/system.c b/src/libgame/system.c
index cfd1f8717b3de795c176e460426413dce71205c2..7321731c75110895a24c6c0380a5036cdf338ee2 100644 (file)
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -45,6 +45,7 @@ LevelDirTree         *leveldir_first = NULL;
 LevelDirTree          *leveldir_current = NULL;
 int                    level_nr;
 
 LevelDirTree          *leveldir_current = NULL;
 int                    level_nr;
 

+struct LevelSetInfo    levelset;

 struct LevelStats      level_stats[MAX_LEVELS];
 
 DrawWindow            *window = NULL;
 struct LevelStats      level_stats[MAX_LEVELS];
 
 DrawWindow            *window = NULL;

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 7c550499acbaed0cce06236df3066048f1290ab9..76169efa6bf0345e6e90f64fc63d827fdee5c7b5 100644 (file)
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -1566,6 +1566,11 @@ struct MouseActionInfo
   int button_hint;
 };
 
   int button_hint;
 };
 

+struct LevelSetInfo
+{
+  int music[MAX_LEVELS];
+};
+

 struct LevelStats
 {
   int played;
 struct LevelStats
 {
   int played;


@@ -1595,6 +1600,7 @@ extern LevelDirTree              *leveldir_first;
 extern LevelDirTree           *leveldir_current;
 extern int                     level_nr;
 
 extern LevelDirTree           *leveldir_current;
 extern int                     level_nr;
 

+extern struct LevelSetInfo     levelset;

 extern struct LevelStats       level_stats[];
 
 extern DrawWindow             *window;
 extern struct LevelStats       level_stats[];
 
 extern DrawWindow             *window;

diff --git a/src/main.c b/src/main.c
index 312cb2cbb1eb5ac170a1ac265faa27c6eb32150a..00d7a46bc0653f10e3c5461cc35914aff5c1f0b4 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -133,7 +133,6 @@ int                 TimeFrames, TimePlayed, TimeLeft, TapeTime;
 
 boolean                        network_player_action_received = FALSE;
 
 
 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];
 struct LevelInfo       level, level_template;
 struct PlayerInfo      stored_player[MAX_PLAYERS], *local_player = NULL;
 struct HiScore         highscore[MAX_SCORE_ENTRIES];

diff --git a/src/main.h b/src/main.h
index 0f7f6637c78057ba79fe1d800691ef05af83fe7a..cea0249e7d8c480ad79bb38be1285277e4141555 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -2966,11 +2966,6 @@ struct EnvelopeInfo
   char text[MAX_ENVELOPE_TEXT_LEN + 1];
 };
 
   char text[MAX_ENVELOPE_TEXT_LEN + 1];
 };
 

-struct LevelSetInfo
-{
-  int music[MAX_LEVELS];
-};
-

 struct LevelFileInfo
 {
   int nr;
 struct LevelFileInfo
 {
   int nr;


@@ -3623,7 +3618,6 @@ extern boolean                    network_player_action_received;
 
 extern int                     graphics_action_mapping[];
 
 
 extern int                     graphics_action_mapping[];
 

-extern struct LevelSetInfo     levelset;

 extern struct LevelInfo                level, level_template;
 extern struct HiScore          highscore[];
 extern struct TapeInfo         tape;
 extern struct LevelInfo                level, level_template;
 extern struct HiScore          highscore[];
 extern struct TapeInfo         tape;