added separate time counter for tape time frames

[rocksndiamonds.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index ce5fbf2012bb9f2817589ebb940a7a43015f738c..2906946675d805c773f5ad8dc94a6f3ad1d3dedd 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -21,6 +21,7 @@
 #include <fcntl.h>
 
 #include "libgame/libgame.h"
+
 #include "game_bd/game_bd.h"
 #include "game_em/game_em.h"
 #include "game_sp/game_sp.h"
@@ -1156,14 +1157,6 @@
 #define EL_BD_FIREFLY_UP               75
 #define EL_BD_FIREFLY_LEFT             76
 #define EL_BD_FIREFLY_DOWN             77
-#define EL_BD_BUTTERFLY_1              EL_BD_BUTTERFLY_DOWN
-#define EL_BD_BUTTERFLY_2              EL_BD_BUTTERFLY_LEFT
-#define EL_BD_BUTTERFLY_3              EL_BD_BUTTERFLY_UP
-#define EL_BD_BUTTERFLY_4              EL_BD_BUTTERFLY_RIGHT
-#define EL_BD_FIREFLY_1                        EL_BD_FIREFLY_LEFT
-#define EL_BD_FIREFLY_2                        EL_BD_FIREFLY_DOWN
-#define EL_BD_FIREFLY_3                        EL_BD_FIREFLY_RIGHT
-#define EL_BD_FIREFLY_4                        EL_BD_FIREFLY_UP
 #define EL_BD_BUTTERFLY                        78
 #define EL_BD_FIREFLY                  79
 #define EL_PLAYER_1                    80
@@ -3923,7 +3916,8 @@ extern int                        BX2, BY2;
 extern int                     SBX_Left, SBX_Right;
 extern int                     SBY_Upper, SBY_Lower;
 
-extern int                     TimeFrames, TimePlayed, TimeLeft, TapeTime;
+extern int                     TimeFrames, TimePlayed, TimeLeft;
+extern int                     TapeTimeFrames, TapeTime;
 
 extern boolean                 network_player_action_received;
 
@@ -3970,6 +3964,7 @@ extern struct ElementActionInfo   element_action_info[];
 extern struct ElementDirectionInfo element_direction_info[];
 extern struct SpecialSuffixInfo special_suffix_info[];
 extern struct TokenIntPtrInfo  image_config_vars[];
+extern struct TokenIntPtrInfo  sound_config_vars[];
 extern struct FontInfo         font_info[];
 extern struct GlobalAnimInfo   global_anim_info[];
 extern struct GlobalAnimNameInfo global_anim_name_info[];
@@ -3982,6 +3977,7 @@ extern struct MusicFileInfo    *music_file_info;
 extern struct HelpAnimInfo     *helpanim_info;
 extern SetupFileHash           *helptext_info;
 extern SetupFileHash          *image_config_hash;
+extern SetupFileHash          *sound_config_hash;
 extern SetupFileHash          *element_token_hash;
 extern SetupFileHash          *graphic_token_hash;
 extern SetupFileHash          *font_token_hash;