X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=009736ffc4224aa68666f655eb8b7a4c89cbc108;hb=005e27dc77775cbda39afc1daabc8d5f6011f575;hp=b4c3c4950347ef3a671f0315586db88d8a8778af;hpb=784245c2e4dd32b84cff6c6044380c7801cb5513;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index b4c3c495..009736ff 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1381,6 +1381,9 @@ struct PlayerInfo
   boolean use_murphy_graphic;
 
   boolean block_last_field;
+  int block_delay;
+  int block_delay_value;
+
   boolean can_fall_into_acid;
 
   boolean LevelSolved, GameOver;
@@ -1417,13 +1420,23 @@ struct PlayerInfo
 
   int show_envelope;
 
+#if 1	/* USE_NEW_MOVE_DELAY */
+  int move_delay;
+  int move_delay_value;
+#else
   unsigned long move_delay;
   int move_delay_value;
+#endif
 
   int move_delay_reset_counter;
 
+#if 1	/* USE_NEW_PUSH_DELAY */
+  int push_delay;
+  int push_delay_value;
+#else
   unsigned long push_delay;
   unsigned long push_delay_value;
+#endif
 
   unsigned long actual_frame_counter;
 
@@ -1662,6 +1675,15 @@ struct ElementGroupInfo
   int choice_pos;		/* current element choice position */
 };
 
+struct ElementNameInfo
+{
+  /* ---------- token and description strings ---------- */
+
+  char *token_name;		/* element token used in config files */
+  char *class_name;		/* element class used in config files */
+  char *editor_description;	/* pre-defined description for level editor */
+};
+
 struct ElementInfo
 {
   /* ---------- token and description strings ---------- */
@@ -1961,6 +1983,7 @@ extern struct GlobalInfo	global;
 extern struct MenuInfo		menu;
 extern struct DoorInfo		door_1, door_2;
 extern struct ElementInfo	element_info[];
+extern struct ElementNameInfo	element_name_info[];
 extern struct ElementActionInfo	element_action_info[];
 extern struct ElementDirectionInfo element_direction_info[];
 extern struct SpecialSuffixInfo special_suffix_info[];
@@ -1973,12 +1996,12 @@ extern struct MusicInfo	       *music_info;
 extern struct MusicFileInfo    *music_file_info;
 extern struct HelpAnimInfo     *helpanim_info;
 extern SetupFileHash           *helptext_info;
+extern struct ConfigTypeInfo	image_config_suffix[];
+extern struct ConfigTypeInfo	sound_config_suffix[];
+extern struct ConfigTypeInfo	music_config_suffix[];
 extern struct ConfigInfo	image_config[];
 extern struct ConfigInfo	sound_config[];
 extern struct ConfigInfo	music_config[];
-extern struct ConfigInfo	image_config_suffix[];
-extern struct ConfigInfo	sound_config_suffix[];
-extern struct ConfigInfo	music_config_suffix[];
 extern struct ConfigInfo	helpanim_config[];
 extern struct ConfigInfo	helptext_config[];