X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=d3241c11e197e4b6234fe34ffa520931bce20257;hb=a77cc0af29b49cab82fa1380c725b1d14c363c46;hp=1767aff4e71966dec5bd6177d59c67457ee5d32b;hpb=7b34743564e27c65b4d9c1ef55c3b12f6cf8a94a;p=rocksndiamonds.git diff --git a/src/main.c b/src/main.c index 1767aff4..d3241c11 100644 --- a/src/main.c +++ b/src/main.c @@ -124,7 +124,8 @@ int BX2, BY2; int SBX_Left, SBX_Right; int SBY_Upper, SBY_Lower; -int TimeFrames, TimePlayed, TimeLeft, TapeTime; +int TimeFrames, TimePlayed, TimeLeft; +int TapeTimeFrames, TapeTime; boolean network_player_action_received = FALSE; @@ -173,6 +174,7 @@ struct HelpAnimInfo *helpanim_info = NULL; SetupFileHash *helptext_info = NULL; SetupFileHash *image_config_hash = NULL; +SetupFileHash *sound_config_hash = NULL; SetupFileHash *element_token_hash = NULL; SetupFileHash *graphic_token_hash = NULL; SetupFileHash *font_token_hash = NULL; @@ -5218,17 +5220,17 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = { "mm_mirror_fixed_2", "mm_mirror_fixed", - "fixed mirror (0\xb0)" + "fixed mirror (45\xb0)" }, { "mm_mirror_fixed_3", "mm_mirror_fixed", - "fixed mirror (0\xb0)" + "fixed mirror (90\xb0)" }, { "mm_mirror_fixed_4", "mm_mirror_fixed", - "fixed mirror (0\xb0)" + "fixed mirror (135\xb0)" }, { "mm_steel_lock", @@ -6440,6 +6442,26 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "df_mirror_fixed", "fixed mirror (DF style) (168.75\xb0)" }, + { + "df_slope_1", + "df_slope", + "slope (DF style) (45\xb0)" + }, + { + "df_slope_2", + "df_slope", + "slope (DF style) (135\xb0)" + }, + { + "df_slope_3", + "df_slope", + "slope (DF style) (225\xb0)" + }, + { + "df_slope_4", + "df_slope", + "slope (DF style) (315\xb0)" + }, // -------------------------------------------------------------------------- // "real" (and therefore drawable) runtime elements @@ -7624,6 +7646,7 @@ struct FontInfo font_info[NUM_FONTS + 1] = { "font.envelope_2" }, { "font.envelope_3" }, { "font.envelope_4" }, + { "font.request_narrow" }, { "font.request" }, { "font.input_1.active" }, { "font.input_2.active" },