From e761f76653b1c12493d1cb047ace29264e537e4b Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 25 Oct 2010 22:41:25 +0000 Subject: SWORD25: Get rid of most of the 'kernel service/superclass' code svn-id: r53835 --- engines/sword25/sword25.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'engines/sword25/sword25.cpp') diff --git a/engines/sword25/sword25.cpp b/engines/sword25/sword25.cpp index 9f3c963013..62fb3506d9 100644 --- a/engines/sword25/sword25.cpp +++ b/engines/sword25/sword25.cpp @@ -95,14 +95,8 @@ Common::Error Sword25Engine::appStart() { return Common::kUnknownError; } - // Package-Manager starten, damit die Packfiles geladen werden können. - PackageManager *packageManagerPtr = static_cast(Kernel::getInstance()->newService("package", PACKAGE_MANAGER)); - if (!packageManagerPtr) { - BS_LOG_ERRORLN("PackageManager initialization failed."); - return Common::kUnknownError; - } - - // Packages laden oder das aktuelle Verzeichnis mounten, wenn das über Kommandozeile angefordert wurde. + // Load packages + PackageManager *packageManagerPtr = Kernel::getInstance()->getPackage(); if (getGameFlags() & GF_EXTRACTED) { if (!packageManagerPtr->loadDirectoryAsPackage(ConfMan.get("path"), "/")) return Common::kUnknownError; @@ -111,7 +105,7 @@ Common::Error Sword25Engine::appStart() { return Common::kUnknownError; } - // Einen Pointer auf den Skript-Engine holen. + // Pass the command line to the script engine. ScriptEngine *scriptPtr = Kernel::getInstance()->getScript(); if (!scriptPtr) { BS_LOG_ERRORLN("Script intialization failed."); @@ -152,7 +146,8 @@ bool Sword25Engine::loadPackages() { BS_ASSERT(packageManagerPtr); // Load the main package - if (!packageManagerPtr->loadPackage("data.b25c", "/")) return false; + if (!packageManagerPtr->loadPackage("data.b25c", "/")) + return false; // Get the contents of the main program directory and sort them alphabetically Common::FSNode dir(ConfMan.get("path")); -- cgit v1.2.3