X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=faf24a99a057b426d5411c8f517246d260bfabfa;hb=c3fa9fcf03db2a48bbd8fa343b79a94c42d4cac3;hp=4937e55c0cdd83433719aee52211e59e4a3908ed;hpb=14d7691c65ca4a466ce9b9448153e8fbe8351a81;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 4937e55c..faf24a99 100644
--- a/src/main.h
+++ b/src/main.h
@@ -43,6 +43,15 @@
 
 #define DEFAULT_FULLSCREEN_MODE		"800x600"
 
+#define WIN_XSIZE_DEFAULT		672
+#define WIN_YSIZE_DEFAULT		560
+
+#define SCR_FIELDX_DEFAULT		17
+#define SCR_FIELDY_DEFAULT		17
+
+#define SXSIZE_DEFAULT			(SCR_FIELDX_DEFAULT * TILEX)
+#define SYSIZE_DEFAULT			(SCR_FIELDY_DEFAULT * TILEY)
+
 #define MAX_BUF_XSIZE			(SCR_FIELDX + 2)
 #define MAX_BUF_YSIZE			(SCR_FIELDY + 2)
 #define MIN_LEV_FIELDX			3
@@ -1976,39 +1985,17 @@
 
 #define PROGRAM_TITLE_STRING		"Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING		"Holger Schemel"
-#define PROGRAM_COPYRIGHT_STRING	"Copyright \xa9""1995-2014 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)
@@ -2179,6 +2166,7 @@ struct MenuInfo
   int scrollbar_xoffset;
 
   int list_size[NUM_SPECIAL_GFX_ARGS];
+  int list_size_info[NUM_SPECIAL_GFX_INFO_ARGS];
 
   struct TitleFadingInfo enter_menu;
   struct TitleFadingInfo leave_menu;
@@ -2222,6 +2210,8 @@ struct RequestInfo
   int step_offset;
   int step_delay;
   int anim_mode;
+  int align;
+  int valign;
   boolean autowrap;
   boolean centered;
   boolean wrap_single_words;
@@ -2239,18 +2229,105 @@ 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_graphic;
+  struct XY element_name;
+
+  struct EditorTabsInfo tabs;
+};
+
+struct EditorGadgetInfo
+{
+  int normal_spacing;
+  int small_spacing;
+  int tiny_spacing;
+  int line_spacing;
+  int text_spacing;
+  int tab_spacing;
+
+  struct Rect separator_line;
+};
+
+struct EditorButtonInfo
+{
+  struct XY prev_level;
+  struct XY next_level;
+
+  struct XY properties;
+
+  struct XY draw_single;
+  struct XY draw_connected;
+  struct XY draw_line;
+  struct XY draw_arc;
+  struct XY draw_rectangle;
+  struct XY draw_filled_box;
+  struct XY rotate_up;
+  struct XY draw_text;
+  struct XY flood_fill;
+  struct XY rotate_left;
+  struct XY zoom_level;
+  struct XY rotate_right;
+  struct XY draw_random;
+  struct XY grab_brush;
+  struct XY rotate_down;
+  struct XY pick_element;
+
+  struct XY ce_copy_from;
+  struct XY ce_copy_to;
+  struct XY ce_swap;
+  struct XY ce_copy;
+  struct XY ce_paste;
+
+  struct XY undo;
+  struct XY conf;
+  struct XY save;
+  struct XY clear;
+  struct XY test;
+  struct XY exit;
+};
+
+struct EditorInputInfo
+{
+  struct XY level_number;
+};
+
+struct EditorPaletteElementInfo
+{
+  int x, y;
+  int tile_size;
+};
+
 struct EditorPaletteInfo
 {
   int x, y;
   int cols, rows;
+  int tile_size;
 
-  struct XY element_left;
-  struct XY element_middle;
-  struct XY element_right;
+  struct EditorPaletteElementInfo element_left;
+  struct EditorPaletteElementInfo element_middle;
+  struct EditorPaletteElementInfo element_right;
 };
 
 struct EditorInfo
 {
+  struct EditorSettingsInfo settings;
+  struct EditorGadgetInfo gadget;
+  struct EditorButtonInfo button;
+  struct EditorInputInfo input;
   struct EditorPaletteInfo palette;
 };
 
@@ -2448,8 +2525,6 @@ struct GlobalInfo
   int num_toons;
 
   float frames_per_second;
-  boolean fps_slowdown;
-  int fps_slowdown_factor;
 
   /* global values for fading screens and masking borders */
   int border_status;
@@ -2811,9 +2886,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];
@@ -2871,6 +2943,9 @@ extern int			VXSIZE, VYSIZE;
 extern int			EXSIZE, EYSIZE;
 extern int			TILESIZE_VAR;
 
+extern int			FADE_SX, FADE_SY;
+extern int			FADE_SXSIZE, FADE_SYSIZE;
+
 extern int			FX, FY;
 extern int			ScrollStepSize;
 extern int			ScreenMovDir, ScreenMovPos, ScreenGfxPos;