X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=83a9f6c60b3444692e1b4b1177e2a620d24afc60;hb=35a55f8aa20694a478ab6e70057167014661469b;hp=00fea82a12c3abc7aeda0ff43dd34f5143c74a8d;hpb=e093d2ffd9547d556207818c38f71d5afa455ad0;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 00fea82a..83a9f6c6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -91,6 +91,7 @@ int			TimeFrames, TimePlayed, TimeLeft;
 
 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];
@@ -102,6 +103,7 @@ struct MenuInfo		menu;
 struct DoorInfo		door_1, door_2;
 struct GraphicInfo     *graphic_info = NULL;
 struct SoundInfo       *sound_info = NULL;
+struct MusicInfo       *music_info = NULL;
 
 
 /* ------------------------------------------------------------------------- */
@@ -3725,8 +3727,9 @@ struct ElementDirectionInfo element_direction_info[NUM_DIRECTIONS + 1] =
   { NULL,		0				}
 };
 
-struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1] =
+struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] =
 {
+  { ".[DEFAULT]",	GAME_MODE_DEFAULT,		},
   { ".MAIN",		GAME_MODE_MAIN,			},
   { ".LEVELS",		GAME_MODE_LEVELS		},
   { ".SCORES",		GAME_MODE_SCORES,		},
@@ -3738,6 +3741,9 @@ struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1] =
   { ".PREVIEW",		GAME_MODE_PSEUDO_PREVIEW,	},
   { ".CRUMBLED",	GAME_MODE_PSEUDO_CRUMBLED,	},
 
+  /* empty suffix always matches -- check as last entry in InitMusicInfo() */
+  { "",			GAME_MODE_DEFAULT,		},
+
   { NULL,		0,				}
 };
 
@@ -3822,6 +3828,18 @@ struct FontInfo font_info[NUM_FONTS + 1] =
 };
 
 
+/* ------------------------------------------------------------------------- */
+/* music token prefix definitions                                            */
+/* ------------------------------------------------------------------------- */
+
+struct MusicPrefixInfo music_prefix_info[NUM_MUSIC_PREFIXES + 1] =
+{
+  { "background",		TRUE	},
+
+  { NULL,			0	}
+};
+
+
 /* ========================================================================= */
 /* main()                                                                    */
 /* ========================================================================= */