diff options
author | Matthew Hoops | 2012-03-20 14:18:57 -0400 |
---|---|---|
committer | Matthew Hoops | 2012-03-20 14:49:16 -0400 |
commit | 71756bdf4eae5ba9cc3f329b85e894f04640aaef (patch) | |
tree | 40d464262da107ab5eed82f198685209161ebac1 /engines/gob/inter.h | |
parent | 03eba05b09e5c9e5a351f8111185934b92a3fed3 (diff) | |
parent | 3c3576a224b92c703b4e8ea20008ac8a069980dd (diff) | |
download | scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.gz scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.bz2 scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.zip |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/gob/inter.h')
-rw-r--r-- | engines/gob/inter.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/engines/gob/inter.h b/engines/gob/inter.h index 6fd4dc2187..c79b6e2260 100644 --- a/engines/gob/inter.h +++ b/engines/gob/inter.h @@ -33,6 +33,8 @@ namespace Gob { +class Cheater_Geisha; + namespace Geisha { class Diving; class Penetration; @@ -371,6 +373,8 @@ protected: private: Geisha::Diving *_diving; Geisha::Penetration *_penetration; + + Cheater_Geisha *_cheater; }; class Inter_v2 : public Inter_v1 { |