X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=60d53c38b25de52eb1a30de4180702eb0fe07bce;hb=5f189129bbc68852e3eb8b8d66c0b01b7f9da8fc;hp=9917df22bbb0a82111db5c584ca4d092e0f9bd13;hpb=1ee5fc101d2f23dd51c49257bbec3cba69aaadfe;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 9917df22..60d53c38 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1985,39 +1985,17 @@
 
 #define PROGRAM_TITLE_STRING		"Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING		"Holger Schemel"
-#define PROGRAM_COPYRIGHT_STRING	"Copyright \xa9""1995-2015 by Holger Schemel"
 #define PROGRAM_EMAIL_STRING		"info@artsoft.org"
 #define PROGRAM_WEBSITE_STRING		"http://www.artsoft.org/"
-#define PROGRAM_GAME_BY_STRING		"A Game by Artsoft Entertainment"
-#define PROGRAM_UNIX_DATADIR_STRING	".rocksndiamonds"
-
-#if defined(CREATE_SPECIAL_EDITION_RND_JUE)
-#undef  PROGRAM_TITLE_STRING
-#define PROGRAM_TITLE_STRING		"R'n'D jue"
-#undef  PROGRAM_UNIX_DATADIR_STRING
-#define PROGRAM_UNIX_DATADIR_STRING	".rnd_jue"
-#endif
+#define PROGRAM_COPYRIGHT_STRING	"Copyright \xa9""1995-2015 by Holger Schemel"
+#define PROGRAM_COMPANY_STRING		"A Game by Artsoft Entertainment"
+
+#define PROGRAM_ICON_FILENAME		"RocksIcon32x32.png"
 
-#define ICON_TITLE_STRING		PROGRAM_TITLE_STRING
 #define COOKIE_PREFIX			"ROCKSNDIAMONDS"
 
-#define USERDATA_DIRECTORY_WIN32	PROGRAM_TITLE_STRING
-#define USERDATA_DIRECTORY_MACOSX	PROGRAM_TITLE_STRING
-#define USERDATA_DIRECTORY_UNIX		PROGRAM_UNIX_DATADIR_STRING
 #define USERDATA_DIRECTORY_OTHER	"userdata"
 
-#if defined(PLATFORM_WIN32)
-#define USERDATA_DIRECTORY		USERDATA_DIRECTORY_WIN32
-#elif defined(PLATFORM_MACOSX)
-#define USERDATA_DIRECTORY		USERDATA_DIRECTORY_MACOSX
-#elif defined(PLATFORM_UNIX)
-#define USERDATA_DIRECTORY		USERDATA_DIRECTORY_UNIX
-#else
-#define USERDATA_DIRECTORY		USERDATA_DIRECTORY_OTHER
-#endif
-
-#define SDL_ICON_FILENAME		"RocksIcon32x32.png"
-
 /* file version numbers for resource files (levels, tapes, score, setup, etc.)
 ** currently supported/known file version numbers:
 **	1.0 (old)
@@ -2248,12 +2226,25 @@ struct PreviewInfo
   int anim_mode;
 };
 
+struct EditorTabsInfo
+{
+  int x;
+  int y;
+  int yoffset2;
+  int width;
+  int height;
+  int draw_xoffset;
+  int draw_yoffset;
+};
+
 struct EditorSettingsInfo
 {
   struct MenuPosInfo headline;
 
-  struct XY element;
-  struct XY tabs;
+  struct XY element_graphic;
+  struct XY element_name;
+
+  struct EditorTabsInfo tabs;
 };
 
 struct EditorGadgetInfo
@@ -2330,9 +2321,7 @@ struct EditorPaletteInfo
 
 struct EditorInfo
 {
-  struct EditorSettingsInfo level_settings;
-  struct EditorSettingsInfo element_settings;
-
+  struct EditorSettingsInfo settings;
   struct EditorGadgetInfo gadget;
   struct EditorButtonInfo button;
   struct EditorInputInfo input;
@@ -2896,9 +2885,6 @@ extern SDL_Thread	       *server_thread;
 
 extern int			key_joystick_mapping;
 
-extern boolean			redraw[2 + MAX_LEV_FIELDX + 2][2 + MAX_LEV_FIELDY + 2];
-extern int			redraw_x1, redraw_y1;
-
 extern short			Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			MovPos[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			MovDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];