SWORD25: Do not use Kernel::GetService directly anymore

svn-id: r53477

4 files changed, 7 insertions, 7 deletions

diff --git a/engines/sword25/kernel/kernel_script.cpp b/engines/sword25/kernel/kernel_script.cpp
index 2f41660fb8..395b0e2637 100644
--- a/engines/sword25/kernel/kernel_script.cpp
+++ b/engines/sword25/kernel/kernel_script.cpp
@@ -171,7 +171,7 @@ static int Crash(lua_State *L) {
 static int ExecuteFile(lua_State *L) {
 	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	ScriptEngine *pSE = static_cast<ScriptEngine *>(pKernel->GetService("script"));
+	ScriptEngine *pSE = pKernel->GetScript();
 	BS_ASSERT(pSE);
 
 	lua_pushbooleancpp(L, pSE->executeFile(luaL_checkstring(L, 1)));
@@ -723,7 +723,7 @@ static const luaL_reg PERSISTENCE_FUNCTIONS[] = {
 // -----------------------------------------------------------------------------
 
 bool Kernel::_RegisterScriptBindings() {
-	ScriptEngine *pScript = static_cast<ScriptEngine *>(GetService("script"));
+	ScriptEngine *pScript = Kernel::GetInstance()->GetScript();
 	BS_ASSERT(pScript);
 	lua_State *L = static_cast<lua_State *>(pScript->getScriptObject());
 	BS_ASSERT(L);
diff --git a/engines/sword25/kernel/persistenceservice.cpp b/engines/sword25/kernel/persistenceservice.cpp
index 7d03497128..79dbcb62e9 100644
--- a/engines/sword25/kernel/persistenceservice.cpp
+++ b/engines/sword25/kernel/persistenceservice.cpp
@@ -358,8 +358,7 @@ bool PersistenceService::SaveGame(uint SlotID, const Common::String &ScreenshotF
 	}
 
 	// Get the screenshot
-	Common::MemoryReadStream *thumbnail = (static_cast<GraphicEngine *>(
-		Kernel::GetInstance()->GetService("gfx")))->getThumbnail();
+	Common::MemoryReadStream *thumbnail = Kernel::GetInstance()->GetGfx()->getThumbnail();
 
 	if (thumbnail) {
 		byte *Buffer = new Byte[FILE_COPY_BUFFER_SIZE];
diff --git a/engines/sword25/kernel/resmanager.cpp b/engines/sword25/kernel/resmanager.cpp
index 9e80f32f8d..0374acf307 100644
--- a/engines/sword25/kernel/resmanager.cpp
+++ b/engines/sword25/kernel/resmanager.cpp
@@ -256,7 +256,7 @@ Resource *ResourceManager::loadResource(const Common::String &fileName) {
 */
 Common::String ResourceManager::GetUniqueFileName(const Common::String &FileName) const {
 	// Get a pointer to the package manager
-	PackageManager *pPackage = (PackageManager *)m_KernelPtr->GetService("package");
+	PackageManager *pPackage = (PackageManager *)m_KernelPtr->GetPackage();
 	if (!pPackage) {
 		BS_LOG_ERRORLN("Could not get package manager.");
 		return Common::String("");
diff --git a/engines/sword25/kernel/resource.cpp b/engines/sword25/kernel/resource.cpp
index f6f4f13f68..3ae4bee98a 100644
--- a/engines/sword25/kernel/resource.cpp
+++ b/engines/sword25/kernel/resource.cpp
@@ -44,9 +44,10 @@ namespace Sword25 {
 Resource::Resource(const Common::String &fileName, RESOURCE_TYPES type) :
 	_type(type),
 	_refCount(0) {
-	BS_ASSERT(Kernel::GetInstance()->GetService("package"));
+	PackageManager *pPM = Kernel::GetInstance()->GetPackage();
+	BS_ASSERT(pPM);
 
-	_fileName = static_cast<PackageManager *>(Kernel::GetInstance()->GetService("package"))->getAbsolutePath(fileName);
+	_fileName = pPM->getAbsolutePath(fileName);
 	_fileNameHash = BS_String::GetHash(fileName);
 }