aboutsummaryrefslogtreecommitdiff
path: root/engines/fullpipe/interaction.h
diff options
context:
space:
mode:
authorColin Snover2017-11-14 22:30:35 -0600
committerEugene Sandulenko2017-11-18 22:35:12 +0100
commite2367f3ed2060b273559200b3e40f75a98bb6a6f (patch)
treecfea744f09c075bedb9b3f4a3e9489bf5b14d829 /engines/fullpipe/interaction.h
parent39ea2f66ac635613c3a817c16f80b11ac207d320 (diff)
downloadscummvm-rg350-e2367f3ed2060b273559200b3e40f75a98bb6a6f.tar.gz
scummvm-rg350-e2367f3ed2060b273559200b3e40f75a98bb6a6f.tar.bz2
scummvm-rg350-e2367f3ed2060b273559200b3e40f75a98bb6a6f.zip
FULLPIPE: Remove unnecessary and unsafe C-style casts
Diffstat (limited to 'engines/fullpipe/interaction.h')
-rw-r--r--engines/fullpipe/interaction.h11
1 files changed, 7 insertions, 4 deletions
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<Interaction> 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) {}