diff options
| author | RichieSams | 2013-09-29 18:04:53 -0500 |
|---|---|---|
| committer | RichieSams | 2013-09-29 18:04:53 -0500 |
| commit | 49d67caa31583478b1b58df19b5739f42d5a4573 (patch) | |
| tree | faa9ee3e3e9346eedccaf44bbfeb054164223e0a /engines/sword25/kernel/objectregistry.h | |
| parent | 07c32312146bb7fe5adec41f03a2463893756361 (diff) | |
| parent | 1c3202794ad71e59e9496b94ac51f102f8210b54 (diff) | |
| download | scummvm-rg350-49d67caa31583478b1b58df19b5739f42d5a4573.tar.gz scummvm-rg350-49d67caa31583478b1b58df19b5739f42d5a4573.tar.bz2 scummvm-rg350-49d67caa31583478b1b58df19b5739f42d5a4573.zip | |
Merge branch 'master' into zvision
Diffstat (limited to 'engines/sword25/kernel/objectregistry.h')
| -rw-r--r-- | engines/sword25/kernel/objectregistry.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sword25/kernel/objectregistry.h b/engines/sword25/kernel/objectregistry.h index d9a7c353f7..449b1b60a3 100644 --- a/engines/sword25/kernel/objectregistry.h +++ b/engines/sword25/kernel/objectregistry.h @@ -139,12 +139,12 @@ protected: } }; - typedef Common::HashMap<uint, T *> HANDLE2PTR_MAP; - typedef Common::HashMap<T *, uint, ClassPointer_Hash, ClassPointer_EqualTo> PTR2HANDLE_MAP; + typedef Common::HashMap<uint32, T *> HANDLE2PTR_MAP; + typedef Common::HashMap<T *, uint32, ClassPointer_Hash, ClassPointer_EqualTo> PTR2HANDLE_MAP; HANDLE2PTR_MAP _handle2PtrMap; PTR2HANDLE_MAP _ptr2HandleMap; - uint _nextHandle; + uint32 _nextHandle; T *findPtrByHandle(uint handle) { // Zum Handle gehörigen Pointer finden. |