diff options
| author | Eugene Sandulenko | 2010-08-06 13:13:25 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-10-12 22:35:55 +0000 |
| commit | 47904bc7b2992189bb554833f00a79ff0fea9fb8 (patch) | |
| tree | 1cec51758c6741b970bd064fafee77607b9f884f /engines/sword25/kernel/objectregistry.h | |
| parent | ca17def625154e5f758b797e4fc48c76b0566320 (diff) | |
| download | scummvm-rg350-47904bc7b2992189bb554833f00a79ff0fea9fb8.tar.gz scummvm-rg350-47904bc7b2992189bb554833f00a79ff0fea9fb8.tar.bz2 scummvm-rg350-47904bc7b2992189bb554833f00a79ff0fea9fb8.zip | |
SWORD25: Mass-astyle.
svn-id: r53222
Diffstat (limited to 'engines/sword25/kernel/objectregistry.h')
| -rw-r--r-- | engines/sword25/kernel/objectregistry.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/engines/sword25/kernel/objectregistry.h b/engines/sword25/kernel/objectregistry.h index 52ff1d556c..befebfaedf 100644 --- a/engines/sword25/kernel/objectregistry.h +++ b/engines/sword25/kernel/objectregistry.h @@ -23,7 +23,7 @@ * */ -/* +/* * This code is based on Broken Sword 2.5 engine * * Copyright (c) Malte Thiesen, Daniel Queteschiner and Michael Elsdoerfer @@ -150,20 +150,22 @@ public: protected: // FIXME: I'm not entirely sure my current hash function is legitimate struct ClassPointer_EqualTo { - bool operator()(const T *x, const T *y) const { return x == y; } + bool operator()(const T *x, const T *y) const { + return x == y; + } }; struct ClassPointer_Hash { - uint operator()(const T *x) const { + uint operator()(const T *x) const { return static_cast<uint>((int64)x % ((int64)1 << sizeof(uint))); } }; - typedef Common::HashMap<unsigned int, T *> HANDLE2PTR_MAP; + typedef Common::HashMap<unsigned int, T *> HANDLE2PTR_MAP; typedef Common::HashMap<T *, unsigned int, ClassPointer_Hash, ClassPointer_EqualTo> PTR2HANDLE_MAP; - HANDLE2PTR_MAP m_Handle2PtrMap; - PTR2HANDLE_MAP m_Ptr2HandleMap; - unsigned int m_NextHandle; + HANDLE2PTR_MAP m_Handle2PtrMap; + PTR2HANDLE_MAP m_Ptr2HandleMap; + unsigned int m_NextHandle; // ----------------------------------------------------------------------------- |