X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=53ead02dbd0448d5a0fcd18fcc4f9217c82aec70;hb=92b6a44481d43254055576a02ce4e335eeab12e9;hp=ca59e8f692fc7a70d71b948f6197db1fe5067334;hpb=a7c06161253796a30a0237a7f5a044f459c8cf35;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index ca59e8f6..53ead02d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -25,7 +25,11 @@ Bitmap		       *bitmap_db_store;
 Bitmap		       *bitmap_db_cross;
 Bitmap		       *bitmap_db_field;
 Bitmap		       *bitmap_db_panel;
+#if 0
 Bitmap		       *bitmap_db_door;
+#endif
+Bitmap		       *bitmap_db_door_1;
+Bitmap		       *bitmap_db_door_2;
 Bitmap		       *bitmap_db_toons;
 DrawBuffer	       *fieldbuffer;
 DrawBuffer	       *drawto_field;
@@ -96,16 +100,22 @@ int			scroll_x, scroll_y;
 
 int			WIN_XSIZE = 672, WIN_YSIZE = 560;
 int			SCR_FIELDX = 17, SCR_FIELDY = 17;
-int			SX = 8, SY = 8;
 int			REAL_SX = 6, REAL_SY = 6;
+int			SX = 8, SY = 8;
 int			DX = 566, DY = 60;
 int			VX = 566, VY = 400;
 int			EX = 566, EY = 356;
 int			dDX, dDY;
-int			SXSIZE = 17 * TILEX;	/* SCR_FIELDX * TILEX */
-int			SYSIZE = 17 * TILEY;	/* SCR_FIELDY * TILEY */
 int			FULL_SXSIZE = 2 + 17 * TILEX + 2; /* 2 + SXSIZE + 2 */
 int			FULL_SYSIZE = 2 + 17 * TILEY + 2; /* 2 + SYSIZE + 2 */
+int			SXSIZE = 17 * TILEX;	/* SCR_FIELDX * TILEX */
+int			SYSIZE = 17 * TILEY;	/* SCR_FIELDY * TILEY */
+int			DXSIZE = 100;
+int			DYSIZE = 280;
+int			VXSIZE = 100;
+int			VYSIZE = 100;
+int			EXSIZE = 100;
+int			EYSIZE = 144;
 int			TILESIZE_VAR = TILESIZE;
 
 #if 1
@@ -159,6 +169,7 @@ struct MenuInfo		menu;
 struct DoorInfo		door_1, door_2;
 struct RequestInfo	request;
 struct PreviewInfo	preview;
+struct EditorInfo	editor;
 
 struct GraphicInfo     *graphic_info = NULL;
 struct SoundInfo       *sound_info = NULL;
@@ -5517,6 +5528,7 @@ struct FontInfo font_info[NUM_FONTS + 1] =
   { "font.envelope_2"		},
   { "font.envelope_3"		},
   { "font.envelope_4"		},
+  { "font.request"		},
   { "font.input_1.active"	},
   { "font.input_2.active"	},
   { "font.input_1"		},
@@ -5590,14 +5602,23 @@ static void print_usage()
 
 int main(int argc, char *argv[])
 {
-  char * window_title_string = getWindowTitleString();
+#if 1
+  InitProgramInfo(argv[0], USERDATA_DIRECTORY, USERDATA_DIRECTORY_UNIX,
+		  PROGRAM_TITLE_STRING, ICON_TITLE_STRING,
+		  X11_ICON_FILENAME, X11_ICONMASK_FILENAME, SDL_ICON_FILENAME,
+		  MSDOS_POINTER_FILENAME,
+		  COOKIE_PREFIX, FILENAME_PREFIX, GAME_VERSION_ACTUAL);
+#else
+  char *window_title_string = getWindowTitleString();
 
   InitProgramInfo(argv[0], USERDATA_DIRECTORY, USERDATA_DIRECTORY_UNIX,
 		  PROGRAM_TITLE_STRING, window_title_string, ICON_TITLE_STRING,
 		  X11_ICON_FILENAME, X11_ICONMASK_FILENAME, SDL_ICON_FILENAME,
 		  MSDOS_POINTER_FILENAME,
 		  COOKIE_PREFIX, FILENAME_PREFIX, GAME_VERSION_ACTUAL);
+#endif
 
+  InitWindowTitleFunction(getWindowTitleString);
   InitExitMessageFunction(DisplayExitMessage);
   InitExitFunction(CloseAllAndExit);
   InitPlatformDependentStuff();