diff options
| author | Johannes Schickel | 2012-09-21 02:18:54 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2012-09-21 02:35:50 +0200 |
| commit | 8aceef971106ba35ab234b165dbe6e19c842f336 (patch) | |
| tree | dc1286a31068872960cd3d5925acba78a2b912a7 /engines/pegasus/neighborhood/caldoria/caldoria.h | |
| parent | b0079f4fa67099cec2c58e7907bf3fe09d0755cf (diff) | |
| download | scummvm-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/neighborhood/caldoria/caldoria.h')
| -rw-r--r-- | engines/pegasus/neighborhood/caldoria/caldoria.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/engines/pegasus/neighborhood/caldoria/caldoria.h b/engines/pegasus/neighborhood/caldoria/caldoria.h index f02101ec3b..c9243e0576 100644 --- a/engines/pegasus/neighborhood/caldoria/caldoria.h +++ b/engines/pegasus/neighborhood/caldoria/caldoria.h @@ -401,8 +401,6 @@ protected: class Caldoria : public Neighborhood { friend class SinclairCallBack; -friend void doorBombTimerExpiredFunction(FunctionPtr *, void *); -friend void sinclairTimerExpiredFunction(FunctionPtr *, void *); public: Caldoria(InputHandler *, PegasusEngine *); |