diff options
| author | Max Horn | 2008-05-06 15:21:46 +0000 |
|---|---|---|
| committer | Max Horn | 2008-05-06 15:21:46 +0000 |
| commit | ba6c4a6239d5496f0f218d8fa76c11e77bf9139e (patch) | |
| tree | 8c7c9d3d32b38e8ddd10499ab10e2b63b5eb8f36 /engines/gob/goblin.h | |
| parent | 4331411ebea61072ff0189d7d61ac57199a120af (diff) | |
| parent | 397e04d0b1ff6d96502c4eca42c1ab4a31b2dbcd (diff) | |
| download | scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.tar.gz scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.tar.bz2 scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.zip | |
Merge with trunk, using the svnmerge tool
svn-id: r31898
Diffstat (limited to 'engines/gob/goblin.h')
| -rw-r--r-- | engines/gob/goblin.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/engines/gob/goblin.h b/engines/gob/goblin.h index 0da4b5ace5..f7ac4aa549 100644 --- a/engines/gob/goblin.h +++ b/engines/gob/goblin.h @@ -315,6 +315,20 @@ protected: virtual void advMovement(Mult::Mult_Object *obj, int8 state); }; +class Goblin_v4 : public Goblin_v3 { +public: + virtual void movePathFind(Mult::Mult_Object *obj, + Gob_Object *gobDesc, int16 nextAct); + virtual void moveAdvance(Mult::Mult_Object *obj, Gob_Object *gobDesc, + int16 nextAct, int16 framesCount); + + Goblin_v4(GobEngine *vm); + virtual ~Goblin_v4() {} + +private: + int16 sub_20430(int16 state, uint16 dir); +}; + } // End of namespace Gob #endif // GOB_GOBLIN_H |