aboutsummaryrefslogtreecommitdiff
path: root/engines/pegasus/util.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2012-09-21 02:18:54 +0200
committerJohannes Schickel2012-09-21 02:35:50 +0200
commit8aceef971106ba35ab234b165dbe6e19c842f336 (patch)
treedc1286a31068872960cd3d5925acba78a2b912a7 /engines/pegasus/util.cpp
parentb0079f4fa67099cec2c58e7907bf3fe09d0755cf (diff)
downloadscummvm-rg350-8aceef971106ba35ab234b165dbe6e19c842f336.tar.gz
scummvm-rg350-8aceef971106ba35ab234b165dbe6e19c842f336.tar.bz2
scummvm-rg350-8aceef971106ba35ab234b165dbe6e19c842f336.zip
PEGASUS: Replace FunctionPtr by our Functor code in Common.
This "fixes" a segmentation fault in our buildbot's toolchain for DC. The segmentation fault occured while compiling engines/pegasus/ai/ai_condition.cpp. Thanks to clone2727 for looking over this and testing it.
Diffstat (limited to 'engines/pegasus/util.cpp')
-rw-r--r--engines/pegasus/util.cpp18
1 files changed, 0 insertions, 18 deletions
diff --git a/engines/pegasus/util.cpp b/engines/pegasus/util.cpp
index 03bc5729cc..59df610c33 100644
--- a/engines/pegasus/util.cpp
+++ b/engines/pegasus/util.cpp
@@ -50,24 +50,6 @@ int operator!=(const IDObject &arg1, const IDObject &arg2) {
return arg1.getObjectID() != arg2.getObjectID();
}
-FunctionPtr::FunctionPtr() {
- _function = 0;
- _functionArg = 0;
-}
-
-FunctionPtr::~FunctionPtr() {
-}
-
-void FunctionPtr::setFunctionPtr(tFunctionPtr function, void *functionArg) {
- _function = function;
- _functionArg = functionArg;
-}
-
-void FunctionPtr::callFunction() {
- if (_function != 0)
- (*_function)(this, _functionArg);
-}
-
int32 pegasusRound(const int32 a, const int32 b) {
if (b < 0)
if (a < 0)