projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20031122-2-src
[rocksndiamonds.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index 00fea82a12c3abc7aeda0ff43dd34f5143c74a8d..f7b2a41e832b8972b44de1924bbc6ec3c72be431 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-91,6
+91,7
@@
int TimeFrames, TimePlayed, TimeLeft;
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];
@@
-102,6
+103,9
@@
struct MenuInfo menu;
struct DoorInfo door_1, door_2;
struct GraphicInfo *graphic_info = NULL;
struct SoundInfo *sound_info = NULL;
struct DoorInfo door_1, door_2;
struct GraphicInfo *graphic_info = NULL;
struct SoundInfo *sound_info = NULL;
+struct MusicInfo *music_info = NULL;
+struct MusicFileInfo *music_file_info = NULL;
+struct InfoAnimationInfo *info_animation_info = NULL;
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
@@
-3473,12
+3477,12
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"-"
},
{
"-"
},
{
- "nut
_
breaking",
+ "nut
.
breaking",
"-",
"-"
},
{
"-",
"-"
},
{
- "diamond
_
breaking",
+ "diamond
.
breaking",
"-",
"-"
},
"-",
"-"
},
@@
-3493,12
+3497,12
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"-"
},
{
"-"
},
{
- "amoeba
_
growing",
+ "amoeba
.
growing",
"-",
"-"
},
{
"-",
"-"
},
{
- "amoeba
_
shrinking",
+ "amoeba
.
shrinking",
"-",
"-"
},
"-",
"-"
},
@@
-3637,6
+3641,11
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"-",
"-"
},
"-",
"-"
},
+ {
+ "amoeba",
+ "amoeba",
+ "-"
+ },
{
"[default]",
"default",
{
"[default]",
"default",
@@
-3657,6
+3666,11
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"sb_default",
"-"
},
"sb_default",
"-"
},
+ {
+ "dummy",
+ "dummy",
+ "-"
+ },
/* keyword to stop parser: "ELEMENT_INFO_END" <-- do not change! */
/* keyword to stop parser: "ELEMENT_INFO_END" <-- do not change! */
@@
-3725,8
+3739,9
@@
struct ElementDirectionInfo element_direction_info[NUM_DIRECTIONS + 1] =
{ NULL, 0 }
};
{ 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, },
{ ".MAIN", GAME_MODE_MAIN, },
{ ".LEVELS", GAME_MODE_LEVELS },
{ ".SCORES", GAME_MODE_SCORES, },
@@
-3738,6
+3753,9
@@
struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1] =
{ ".PREVIEW", GAME_MODE_PSEUDO_PREVIEW, },
{ ".CRUMBLED", GAME_MODE_PSEUDO_CRUMBLED, },
{ ".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, }
};
{ NULL, 0, }
};
@@
-3822,6
+3840,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() */
/* ========================================================================= */
/* ========================================================================= */
/* main() */
/* ========================================================================= */