From: Holger Schemel Date: Tue, 28 Aug 2018 02:20:15 +0000 (+0200) Subject: moved level set info structure to game library layer X-Git-Tag: 4.1.1.0~50 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=187654874c567be3a92e0b53aa1df45407432265;p=rocksndiamonds.git moved level set info structure to game library layer --- diff --git a/src/libgame/system.c b/src/libgame/system.c index cfd1f871..7321731c 100644 --- 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; +struct LevelSetInfo levelset; struct LevelStats level_stats[MAX_LEVELS]; DrawWindow *window = NULL; diff --git a/src/libgame/system.h b/src/libgame/system.h index 7c550499..76169efa 100644 --- a/src/libgame/system.h +++ b/src/libgame/system.h @@ -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; diff --git a/src/main.c b/src/main.c index 312cb2cb..00d7a46b 100644 --- a/src/main.c +++ b/src/main.c @@ -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]; diff --git a/src/main.h b/src/main.h index 0f7f6637..cea0249e 100644 --- a/src/main.h +++ b/src/main.h @@ -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;