fixed bug with keyboard/joystick events unpausing MM style games

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index cf83e5043229b5cef9326927bf2ddd34db6e83f6..dc929129d257df31797827dd1da0cbbea6e39765 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -552,13 +552,9 @@ void InitFontGraphicInfo()
       font_bitmap_info[font_bitmap_id].height = graphic_info[graphic].height;
 
       font_bitmap_info[font_bitmap_id].offset_x =
-       (graphic_info[graphic].offset_x != 0 ?
-        graphic_info[graphic].offset_x :
-        graphic_info[graphic].width);
+       graphic_info[graphic].offset_x;
       font_bitmap_info[font_bitmap_id].offset_y =
-       (graphic_info[graphic].offset_y != 0 ?
-        graphic_info[graphic].offset_y :
-        graphic_info[graphic].height);
+       graphic_info[graphic].offset_y;
 
       font_bitmap_info[font_bitmap_id].draw_xoffset =
        graphic_info[graphic].draw_xoffset;
@@ -5127,6 +5123,10 @@ static void InitArtworkConfig()
   {
     "name",
     "sort_priority",
+    "program_title",
+    "program_copyright",
+    "program_company",
+
     NULL
   };
   static char **ignore_image_tokens;
@@ -5431,6 +5431,7 @@ void InitGfx()
   InitGfxDrawBusyAnimFunction(DrawInitAnim);
   InitGfxDrawGlobalAnimFunction(DrawGlobalAnimations);
   InitGfxDrawGlobalBorderFunction(DrawMaskedBorderToTarget);
+  InitGfxDrawTileCursorFunction(DrawTileCursor);
 
   gfx.fade_border_source_status = global.border_status;
   gfx.fade_border_target_status = global.border_status;
@@ -6008,6 +6009,7 @@ void OpenAll()
   InitVideoDisplay();
   InitVideoBuffer(WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH, setup.fullscreen);
 
+  InitTileCursorInfo();
   InitOverlayInfo();
 
   print_timestamp_time("[init video stuff]");