aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25
diff options
context:
space:
mode:
authorSven Hesse2010-10-13 11:42:17 +0000
committerSven Hesse2010-10-13 11:42:17 +0000
commitff0160050a7f1a7bd9d338ec6d159fdf714c165c (patch)
tree4a1e64167de3a2126f407c2074988e9fbabf26bb /engines/sword25
parentc81da6dcb6edb610574fb90ff32fc976b5362ec5 (diff)
downloadscummvm-rg350-ff0160050a7f1a7bd9d338ec6d159fdf714c165c.tar.gz
scummvm-rg350-ff0160050a7f1a7bd9d338ec6d159fdf714c165c.tar.bz2
scummvm-rg350-ff0160050a7f1a7bd9d338ec6d159fdf714c165c.zip
SWORD25: Force cast to uint instead of unsigned long long
As per Fingolfin's request, because apparently there's no long long in the C++ standard; and ScummVM's hashmap needs uint. svn-id: r53413
Diffstat (limited to 'engines/sword25')
-rw-r--r--engines/sword25/kernel/callbackregistry.h4
-rw-r--r--engines/sword25/kernel/objectregistry.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/sword25/kernel/callbackregistry.h b/engines/sword25/kernel/callbackregistry.h
index 5dde8ba712..ddf5608446 100644
--- a/engines/sword25/kernel/callbackregistry.h
+++ b/engines/sword25/kernel/callbackregistry.h
@@ -74,8 +74,8 @@ private:
}
};
struct CallbackPtr_Hash {
- unsigned long long operator()(CallbackPtr x) const {
- return (unsigned long long)x;
+ uint operator()(CallbackPtr x) const {
+ return *(uint *)&x;
}
};
diff --git a/engines/sword25/kernel/objectregistry.h b/engines/sword25/kernel/objectregistry.h
index 2f4cb9d3f7..3a27ba4942 100644
--- a/engines/sword25/kernel/objectregistry.h
+++ b/engines/sword25/kernel/objectregistry.h
@@ -136,8 +136,8 @@ protected:
}
};
struct ClassPointer_Hash {
- unsigned long long operator()(const T *x) const {
- return (unsigned long long)x;
+ uint operator()(const T *x) const {
+ return *(uint *)&x;
}
};