diff options
| author | Einar Johan Trøan Sømåen | 2013-04-19 17:16:57 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2013-04-19 17:17:53 +0200 |
| commit | 72d0affe014026125168f1a6785ef0f57447c6df (patch) | |
| tree | 6baea0011df938d2cdd34ce64945093d0e27c64f /engines/wintermute/base/base_persistence_manager.cpp | |
| parent | 60a474d452440ea7ea736cc95d92a1561fc50442 (diff) | |
| download | scummvm-rg350-72d0affe014026125168f1a6785ef0f57447c6df.tar.gz scummvm-rg350-72d0affe014026125168f1a6785ef0f57447c6df.tar.bz2 scummvm-rg350-72d0affe014026125168f1a6785ef0f57447c6df.zip | |
WINTERMUTE: Rename transfer(void *) to transferPtr(void *) to avoid overload-misses.
Diffstat (limited to 'engines/wintermute/base/base_persistence_manager.cpp')
| -rw-r--r-- | engines/wintermute/base/base_persistence_manager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp index 12bc62d5dc..aec540dcf0 100644 --- a/engines/wintermute/base/base_persistence_manager.cpp +++ b/engines/wintermute/base/base_persistence_manager.cpp @@ -848,7 +848,8 @@ bool BasePersistenceManager::transfer(const char *name, Vector2 *val) { ////////////////////////////////////////////////////////////////////////// // generic pointer -bool BasePersistenceManager::transfer(const char *name, void *val) { + +bool BasePersistenceManager::transferPtr(const char *name, void *val) { int classID = -1, instanceID = -1; if (_saving) { @@ -869,7 +870,6 @@ bool BasePersistenceManager::transfer(const char *name, void *val) { return STATUS_OK; } - ////////////////////////////////////////////////////////////////////////// bool BasePersistenceManager::checkVersion(byte verMajor, byte verMinor, byte verBuild) { if (_saving) { |