X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=3c6e492ce8f6b5f8002e5ceb78828f3c41a3e1e2;hb=765dcb99ef77ec52dd1e5f0a459ce5ffffcc9cd6;hp=0f7f6637c78057ba79fe1d800691ef05af83fe7a;hpb=7ffc20bb526bb0fe79bfbf206cb5b76cb3c9f052;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index 0f7f6637..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) @@ -2966,11 +2967,6 @@ struct EnvelopeInfo char text[MAX_ENVELOPE_TEXT_LEN + 1]; }; -struct LevelSetInfo -{ - int music[MAX_LEVELS]; -}; - struct LevelFileInfo { int nr; @@ -3130,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; @@ -3623,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;