From 8aceef971106ba35ab234b165dbe6e19c842f336 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Fri, 21 Sep 2012 02:18:54 +0200 Subject: 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. --- engines/pegasus/neighborhood/tsa/fulltsa.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engines/pegasus/neighborhood/tsa/fulltsa.cpp') diff --git a/engines/pegasus/neighborhood/tsa/fulltsa.cpp b/engines/pegasus/neighborhood/tsa/fulltsa.cpp index 2269ea7122..98c70aa09d 100644 --- a/engines/pegasus/neighborhood/tsa/fulltsa.cpp +++ b/engines/pegasus/neighborhood/tsa/fulltsa.cpp @@ -663,8 +663,8 @@ void FullTSA::init() { entry->hotspotItem = kPegasusBiochip; } -void uncreatedInTSAFunction(FunctionPtr *, void *tsa) { - ((FullTSA *)tsa)->die(kDeathUncreatedInTSA); +void FullTSA::dieUncreatedInTSA() { + die(kDeathUncreatedInTSA); } void FullTSA::start() { @@ -672,7 +672,7 @@ void FullTSA::start() { if (!GameState.getScoringEnterTSA()) { _utilityFuse.primeFuse(GameState.getTSAFuseTimeLimit()); - _utilityFuse.setFunctionPtr(&uncreatedInTSAFunction, (void *)this); + _utilityFuse.setFunctor(new Common::Functor0Mem(this, &FullTSA::dieUncreatedInTSA)); _utilityFuse.lightFuse(); } else if (GameState.getTSAState() == kTSAPlayerDetectedRip || GameState.getTSAState() == kTSAPlayerNeedsHistoricalLog) { _ripTimer.initImage(); -- cgit v1.2.3