From e2367f3ed2060b273559200b3e40f75a98bb6a6f Mon Sep 17 00:00:00 2001 From: Colin Snover Date: Tue, 14 Nov 2017 22:30:35 -0600 Subject: FULLPIPE: Remove unnecessary and unsafe C-style casts --- engines/fullpipe/interaction.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'engines/fullpipe/interaction.h') diff --git a/engines/fullpipe/interaction.h b/engines/fullpipe/interaction.h index 97fb19beb9..9ffcdccc91 100644 --- a/engines/fullpipe/interaction.h +++ b/engines/fullpipe/interaction.h @@ -62,13 +62,16 @@ class Interaction : public CObject { }; class InteractionController : public CObject { - public: - ObList _interactions; - int16 _field_20; + friend bool canInteractAny(GameObject *obj1, GameObject *obj2, int invId); + +public: + typedef ObList InteractionList; bool _flag24; private: - static bool compareInteractions(const void *p1, const void *p2); + InteractionList _interactions; + int16 _field_20; + static bool compareInteractions(const Interaction *i1, const Interaction *i2); public: InteractionController() : _field_20(0), _flag24(true) {} -- cgit v1.2.3