rnd-20030331-1-src

[rocksndiamonds.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index aa5926f5fb30692019f36f80216559a3c7f80ff6..3922fb29bc760a9ee792a9d86e9589fa5e5ceb85 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -858,10 +858,18 @@
 #define WINDOW_TITLE_STRING    PROGRAM_TITLE_STRING " " PROGRAM_IDENT_STRING
 #define WINDOW_SUBTITLE_STRING PROGRAM_RIGHTS_STRING " " PROGRAM_AUTHOR_STRING
 #define ICON_TITLE_STRING      PROGRAM_TITLE_STRING
-#define UNIX_USERDATA_DIRECTORY        ".rocksndiamonds"
 #define COOKIE_PREFIX          "ROCKSNDIAMONDS"
 #define FILENAME_PREFIX                "Rocks"
 
+#define USERDATA_DIR_STRING    "Userdata"
+#if defined(PLATFORM_UNIX)
+#define USERDATA_DIRECTORY     ".rocksndiamonds"
+#elif defined(PLATFORM_WIN32)
+#define USERDATA_DIRECTORY     PROGRAM_TITLE_STRING " " USERDATA_DIR_STRING
+#else
+#define USERDATA_DIRECTORY     USERDATA_DIR_STRING
+#endif
+
 #define X11_ICON_FILENAME      "rocks_icon.xbm"
 #define X11_ICONMASK_FILENAME  "rocks_iconmask.xbm"
 #define MSDOS_POINTER_FILENAME "mouse.pcx"
@@ -935,9 +943,9 @@ struct PlayerInfo
 
   int last_move_dir;
   boolean is_moving;
-
-  boolean is_digging;
   boolean is_waiting;
+  boolean is_digging;
+  boolean is_collecting;
 
   unsigned long move_delay;
   int move_delay_value;
@@ -996,6 +1004,7 @@ struct TapeInfo
   int game_version;    /* game release version the tape was created with */
   int engine_version;  /* game engine version the tape was recorded with */
 
+  char *level_identifier;
   int level_nr;
   unsigned long random_seed;
   unsigned long date;
@@ -1050,6 +1059,14 @@ struct GlobalInfo
 
   int num_toons;
 
+  int menu_draw_xoffset;
+  int menu_draw_yoffset;
+  int menu_draw_xoffset_MAIN;
+  int menu_draw_yoffset_MAIN;
+
+  int door_step_offset;
+  int door_step_delay;
+
   float frames_per_second;
   boolean fps_slowdown;
   int fps_slowdown_factor;