diff options
Diffstat (limited to 'engines/wintermute/persistent.h')
| -rw-r--r-- | engines/wintermute/persistent.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/wintermute/persistent.h b/engines/wintermute/persistent.h index 30f9cd8780..5d81ff51e9 100644 --- a/engines/wintermute/persistent.h +++ b/engines/wintermute/persistent.h @@ -48,9 +48,9 @@ namespace WinterMute { #define DECLARE_PERSISTENT(class_name, parent_class)\ static const char _className[];\ - static void* WINAPI PersistBuild(void);\ - virtual const char* GetClassName();\ - static HRESULT WINAPI PersistLoad(void* Instance, CBPersistMgr* PersistMgr);\ + static void* WINAPI persistBuild(void);\ + virtual const char* getClassName();\ + static HRESULT WINAPI persistLoad(void* Instance, CBPersistMgr* PersistMgr);\ class_name(TDynamicConstructor p1, TDynamicConstructor p2):parent_class(p1, p2){ /*memset(this, 0, sizeof(class_name));*/ };\ virtual HRESULT persist(CBPersistMgr* PersistMgr);\ void* operator new (size_t size);\ @@ -59,15 +59,15 @@ namespace WinterMute { #define IMPLEMENT_PERSISTENT(class_name, persistent_class)\ const char class_name::_className[] = #class_name;\ - void* class_name::PersistBuild(){\ + void* class_name::persistBuild(){\ return ::new class_name(DYNAMIC_CONSTRUCTOR, DYNAMIC_CONSTRUCTOR);\ }\ \ - HRESULT class_name::PersistLoad(void* Instance, CBPersistMgr* PersistMgr){\ + HRESULT class_name::persistLoad(void* Instance, CBPersistMgr* PersistMgr){\ return ((class_name*)Instance)->persist(PersistMgr);\ }\ \ - const char* class_name::GetClassName(){\ + const char* class_name::getClassName(){\ return #class_name;\ }\ \ @@ -75,12 +75,12 @@ namespace WinterMute { \ void* class_name::operator new (size_t size){\ void* ret = ::operator new(size);\ - CSysClassRegistry::GetInstance()->RegisterInstance(#class_name, ret);\ + CSysClassRegistry::getInstance()->registerInstance(#class_name, ret);\ return ret;\ }\ \ void class_name::operator delete (void* p){\ - CSysClassRegistry::GetInstance()->UnregisterInstance(#class_name, p);\ + CSysClassRegistry::getInstance()->unregisterInstance(#class_name, p);\ ::operator delete(p);\ }\ |