aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sci.h
diff options
context:
space:
mode:
authorMartin Kiewitz2010-08-23 20:29:13 +0000
committerMartin Kiewitz2010-08-23 20:29:13 +0000
commit0c5561105cd0b3255a26549f2752db8f9ffdd277 (patch)
tree120c2cc3759f148645e9f5bdbd5eaeb21d827942 /engines/sci/sci.h
parentedea88cf54056d4c903977525d19071097efdd93 (diff)
downloadscummvm-rg350-0c5561105cd0b3255a26549f2752db8f9ffdd277.tar.gz
scummvm-rg350-0c5561105cd0b3255a26549f2752db8f9ffdd277.tar.bz2
scummvm-rg350-0c5561105cd0b3255a26549f2752db8f9ffdd277.zip
SCI: storing game super class address now inside SciEngine
svn-id: r52311
Diffstat (limited to 'engines/sci/sci.h')
-rw-r--r--engines/sci/sci.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/sci/sci.h b/engines/sci/sci.h
index 0ea90aba36..8f8ea7cae9 100644
--- a/engines/sci/sci.h
+++ b/engines/sci/sci.h
@@ -233,7 +233,8 @@ public:
inline EngineState *getEngineState() const { return _gamestate; }
inline Vocabulary *getVocabulary() const { return _vocabulary; }
inline EventManager *getEventManager() const { return _eventMan; }
- inline reg_t getGameObject() const { return _gameObj; }
+ inline reg_t getGameObject() const { return _gameObjectAddress; }
+ inline reg_t getGameSuperClassAddress() const { return _gameSuperClassAddress; }
Common::RandomSource &getRNG() { return _rng; }
@@ -342,7 +343,8 @@ private:
Vocabulary *_vocabulary;
int16 _vocabularyLanguage;
EventManager *_eventMan;
- reg_t _gameObj; /**< Pointer to the game object */
+ reg_t _gameObjectAddress; /**< Pointer to the game object */
+ reg_t _gameSuperClassAddress; // Address of the super class of the game object
Console *_console;
Common::RandomSource _rng;
};