aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/sword25.cpp
diff options
context:
space:
mode:
authorMax Horn2010-10-15 12:18:19 +0000
committerMax Horn2010-10-15 12:18:19 +0000
commit550073ee049ba30d84cb76c82fb18c045b07569f (patch)
tree0b67327d8f27969c6a6ebd1971fafee6cd7b70d9 /engines/sword25/sword25.cpp
parent2b5de8c8921d8ec012c689597870e5ae781e3b81 (diff)
downloadscummvm-rg350-550073ee049ba30d84cb76c82fb18c045b07569f.tar.gz
scummvm-rg350-550073ee049ba30d84cb76c82fb18c045b07569f.tar.bz2
scummvm-rg350-550073ee049ba30d84cb76c82fb18c045b07569f.zip
SWORD25: Do not use Kernel::GetService directly anymore
svn-id: r53477
Diffstat (limited to 'engines/sword25/sword25.cpp')
-rw-r--r--engines/sword25/sword25.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sword25/sword25.cpp b/engines/sword25/sword25.cpp
index 4e99ade25d..0d49d32f2d 100644
--- a/engines/sword25/sword25.cpp
+++ b/engines/sword25/sword25.cpp
@@ -115,7 +115,7 @@ Common::Error Sword25Engine::appStart() {
}
// Einen Pointer auf den Skript-Engine holen.
- ScriptEngine *scriptPtr = static_cast<ScriptEngine *>(Kernel::GetInstance()->GetService("script"));
+ ScriptEngine *scriptPtr = Kernel::GetInstance()->GetScript();
if (!scriptPtr) {
BS_LOG_ERRORLN("Script intialization failed.");
return Common::kUnknownError;
@@ -129,7 +129,7 @@ Common::Error Sword25Engine::appStart() {
bool Sword25Engine::appMain() {
// The main script start. This script loads all the other scripts and starts the actual game.
- ScriptEngine *scriptPtr = static_cast<ScriptEngine *>(Kernel::GetInstance()->GetService("script"));
+ ScriptEngine *scriptPtr = Kernel::GetInstance()->GetScript();
BS_ASSERT(scriptPtr);
scriptPtr->executeFile(DEFAULT_SCRIPT_FILE);
@@ -147,7 +147,7 @@ bool Sword25Engine::appEnd() {
}
bool Sword25Engine::loadPackages() {
- PackageManager *packageManagerPtr = reinterpret_cast<PackageManager *>(Kernel::GetInstance()->GetService("package"));
+ PackageManager *packageManagerPtr = Kernel::GetInstance()->GetPackage();
BS_ASSERT(packageManagerPtr);
// Load the main package