diff options
Diffstat (limited to 'engines/sword25/kernel')
| -rw-r--r-- | engines/sword25/kernel/callbackregistry.h | 2 | ||||
| -rw-r--r-- | engines/sword25/kernel/filesystemutil.h | 2 | ||||
| -rw-r--r-- | engines/sword25/kernel/persistenceservice.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/engines/sword25/kernel/callbackregistry.h b/engines/sword25/kernel/callbackregistry.h index ddf5608446..a309dcee6f 100644 --- a/engines/sword25/kernel/callbackregistry.h +++ b/engines/sword25/kernel/callbackregistry.h @@ -55,7 +55,7 @@ typedef void (*CallbackPtr)(int command); class CallbackRegistry { public: - static CallbackRegistry &getInstance() { + static CallbackRegistry &instance() { static CallbackRegistry _instance; return _instance; } diff --git a/engines/sword25/kernel/filesystemutil.h b/engines/sword25/kernel/filesystemutil.h index 122d3f021c..13762a29ee 100644 --- a/engines/sword25/kernel/filesystemutil.h +++ b/engines/sword25/kernel/filesystemutil.h @@ -38,7 +38,7 @@ * operations that do not have equivalents in the C/C++ libraries. * * Each supported platform must implement this interface, and the method - * BS_FileSystemUtil Singleton::getInstance() + * BS_FileSystemUtil Singleton::instance() */ #ifndef SWORD25_FILESYSTEMUTIL_H diff --git a/engines/sword25/kernel/persistenceservice.cpp b/engines/sword25/kernel/persistenceservice.cpp index 871bc37e2a..7d03497128 100644 --- a/engines/sword25/kernel/persistenceservice.cpp +++ b/engines/sword25/kernel/persistenceservice.cpp @@ -326,7 +326,7 @@ bool PersistenceService::SaveGame(uint SlotID, const Common::String &ScreenshotF OutputPersistenceBlock Writer; bool Success = true; Success &= Kernel::GetInstance()->GetScript()->persist(Writer); - Success &= RegionRegistry::getInstance().persist(Writer); + Success &= RegionRegistry::instance().persist(Writer); Success &= Kernel::GetInstance()->GetGfx()->persist(Writer); Success &= Kernel::GetInstance()->GetSfx()->persist(Writer); Success &= Kernel::GetInstance()->GetInput()->persist(Writer); @@ -445,7 +445,7 @@ bool PersistenceService::LoadGame(uint SlotID) { bool Success = true; Success &= Kernel::GetInstance()->GetScript()->unpersist(Reader); // Muss unbedingt nach Script passieren. Da sonst die bereits wiederhergestellten Regions per Garbage-Collection gekillt werden. - Success &= RegionRegistry::getInstance().unpersist(Reader); + Success &= RegionRegistry::instance().unpersist(Reader); Success &= Kernel::GetInstance()->GetGfx()->unpersist(Reader); Success &= Kernel::GetInstance()->GetSfx()->unpersist(Reader); Success &= Kernel::GetInstance()->GetInput()->unpersist(Reader); |