diff options
Diffstat (limited to 'engines/pegasus/items')
| -rw-r--r-- | engines/pegasus/items/inventory/airmask.cpp | 4 | ||||
| -rw-r--r-- | engines/pegasus/items/inventory/airmask.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/pegasus/items/inventory/airmask.cpp b/engines/pegasus/items/inventory/airmask.cpp index 559410fc79..85d4449f9f 100644 --- a/engines/pegasus/items/inventory/airmask.cpp +++ b/engines/pegasus/items/inventory/airmask.cpp @@ -36,7 +36,7 @@ AirMask *g_airMask = 0; // Based on full == 100, which is scale used by GetAirLeft(). static const TimeValue kOxygenLowThreshold = 25; -void AirMask::airMaskTimerExpired(FunctionPtr *, void *) { +void AirMask::airMaskTimerExpired() { if (g_neighborhood) g_neighborhood->checkAirMask(); } @@ -49,7 +49,7 @@ AirMask::AirMask(const ItemID id, const NeighborhoodID neighborhood, const RoomI g_allHotspots.push_back(&_toggleSpot); setItemState(kAirMaskEmptyOff); _oxygenTimer.primeFuse(0); - _oxygenTimer.setFunctionPtr(&airMaskTimerExpired, 0); + _oxygenTimer.setFunctor(new Common::Functor0Mem<void, AirMask>(this, &AirMask::airMaskTimerExpired)); } AirMask::~AirMask() { diff --git a/engines/pegasus/items/inventory/airmask.h b/engines/pegasus/items/inventory/airmask.h index f207f3b82b..6a2d708a6c 100644 --- a/engines/pegasus/items/inventory/airmask.h +++ b/engines/pegasus/items/inventory/airmask.h @@ -59,7 +59,7 @@ public: void clickInAirMaskHotspot(); protected: - static void airMaskTimerExpired(FunctionPtr *, void *); + void airMaskTimerExpired(); virtual void removedFromInventory(); virtual void addedToInventory(); |