X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.h;h=3c6e492ce8f6b5f8002e5ceb78828f3c41a3e1e2;hp=b71bb3cef6ad46165484a3fff54cd67ed82556c3;hb=39fb4fecfb8d4647d3563bdb18ce0065f6129522;hpb=bd9eb07192105e183db44f03d675332ffb2b767a

diff --git a/src/main.h b/src/main.h
index b71bb3ce..3c6e492c 100644
--- a/src/main.h
+++ b/src/main.h
@@ -905,6 +905,7 @@
 #define IS_NEXT_FRAME(f, g)	(IS_NEW_FRAME(f, g) && (f) > 0)
 
 #define IS_LOOP_SOUND(s)	(sound_info[s].loop)
+#define IS_LOOP_MUSIC(s)	(music_info[s].loop)
 
 #define IS_SPECIAL_GFX_ARG(a)	((a) >= 0 && (a) < NUM_SPECIAL_GFX_ARGS)
 
@@ -2440,8 +2441,9 @@
 #define FONT_GAME_INFO			39
 #define FONT_INFO_ELEMENTS		40
 #define FONT_INFO_LEVELSET		41
+#define FONT_MAIN_NETWORK_PLAYERS	42
 
-#define NUM_FONTS			42
+#define NUM_FONTS			43
 #define NUM_INITIAL_FONTS		4
 
 /* values for toon animation configuration */
@@ -2684,6 +2686,9 @@ struct MenuMainInfo
   struct MenuMainButtonInfo button;
   struct MenuMainTextInfo text;
   struct MenuMainInputInfo input;
+
+  struct TextPosInfo preview_players;
+  struct TextPosInfo network_players;
 };
 
 struct TitleFadingInfo
@@ -2962,11 +2967,6 @@ struct EnvelopeInfo
   char text[MAX_ENVELOPE_TEXT_LEN + 1];
 };
 
-struct LevelSetInfo
-{
-  int music[MAX_LEVELS];
-};
-
 struct LevelFileInfo
 {
   int nr;
@@ -3126,6 +3126,17 @@ struct LevelInfo
   boolean use_action_after_change_bug;
 };
 
+struct NetworkLevelInfo
+{
+  char *leveldir_identifier;		/* network levelset identifier */
+
+  struct LevelFileInfo file_info;	/* file info for level file */
+  struct LevelFileInfo tmpl_info;	/* file info for level template */
+
+  boolean use_network_level_files;	/* use levels from network server */
+  boolean use_custom_template;		/* use CEs from level template */
+};
+
 struct GlobalInfo
 {
   char *autoplay_leveldir;
@@ -3619,7 +3630,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;