From d6b114b5b35487ee639d91238e7d40b6d5aa976b Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 22 Mar 2020 21:11:27 -0700 Subject: [PATCH] ULTIMA4: Fix loading screen now showing correctly Turns out the default new VGA charset has a required scaling of 2x. So the prior 320x200 screen also has to be doubled so it displays. --- engines/ultima/ultima4/gfx/screen.cpp | 5 +++-- engines/ultima/ultima4/ultima4.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/engines/ultima/ultima4/gfx/screen.cpp b/engines/ultima/ultima4/gfx/screen.cpp index 7d76fc15c41..fda7c21aa35 100644 --- a/engines/ultima/ultima4/gfx/screen.cpp +++ b/engines/ultima/ultima4/gfx/screen.cpp @@ -57,9 +57,10 @@ Screen::Screen() { g_screen = this; Graphics::PixelFormat SCREEN_FORMAT(2, 5, 6, 5, 0, 11, 5, 0, 0); - initGraphics(SCREEN_WIDTH, SCREEN_HEIGHT, &SCREEN_FORMAT); + Common::Point size(SCREEN_WIDTH * settings._scale, SCREEN_HEIGHT * settings._scale); + initGraphics(size.x, size.y, &SCREEN_FORMAT); - create(SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_FORMAT); + create(size.x, size.y, SCREEN_FORMAT); } Screen::~Screen() { diff --git a/engines/ultima/ultima4/ultima4.cpp b/engines/ultima/ultima4/ultima4.cpp index a8b4f10d4ee..407656add39 100644 --- a/engines/ultima/ultima4/ultima4.cpp +++ b/engines/ultima/ultima4/ultima4.cpp @@ -60,7 +60,7 @@ Ultima4Engine::~Ultima4Engine() { Tileset::unloadAll(); ImageMgr::destroy(); - delete musicMgr; + //delete musicMgr; soundDelete(); }