From 46118c2100b3c6e59491c245b2897d7698720f69 Mon Sep 17 00:00:00 2001 From: Matthew Jimenez Date: Thu, 2 Feb 2023 18:21:20 -0600 Subject: [PATCH] ULTIMA8: Cleanup shutdown methods --- engines/ultima/ultima8/ultima8.cpp | 20 -------------------- engines/ultima/ultima8/ultima8.h | 1 - 2 files changed, 21 deletions(-) diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp index 62f2c1aed55..38c3f0884b5 100644 --- a/engines/ultima/ultima8/ultima8.cpp +++ b/engines/ultima/ultima8/ultima8.cpp @@ -534,10 +534,6 @@ Common::Error Ultima8Engine::startupGame() { } void Ultima8Engine::shutdown() { - shutdownGame(false); -} - -void Ultima8Engine::shutdownGame(bool reloading) { debug(MM_INFO, "-- Shutting down Game -- "); // Save config here.... @@ -588,22 +584,6 @@ void Ultima8Engine::shutdownGame(bool reloading) { _gameInfo = nullptr; debug(MM_INFO, "-- Game Shutdown -- "); - - if (reloading) { - Rect dims; - _screen->GetSurfaceDims(dims); - - debugN(MM_INFO, "Creating Desktop...\n"); - _desktopGump = new DesktopGump(0, 0, dims.width(), dims.height()); - _desktopGump->InitGump(0); - _desktopGump->MakeFocus(); - - if (GAME_IS_U8) { - debugN(MM_INFO, "Creating Inverter...\n"); - _inverterGump = new InverterGump(0, 0, dims.width(), dims.height()); - _inverterGump->InitGump(0); - } - } } // diff --git a/engines/ultima/ultima8/ultima8.h b/engines/ultima/ultima8/ultima8.h index 4fda211c363..5af6d936423 100644 --- a/engines/ultima/ultima8/ultima8.h +++ b/engines/ultima/ultima8/ultima8.h @@ -196,7 +196,6 @@ public: bool setupGame(); Common::Error startupGame(); - void shutdownGame(bool reloading = true); void changeVideoMode(int width, int height);