diff options
author | David Eriksson | 2003-10-12 19:16:48 +0000 |
---|---|---|
committer | David Eriksson | 2003-10-12 19:16:48 +0000 |
commit | ba281b251af3f9db2305517a20541fab182440c3 (patch) | |
tree | 3b794e29794c3ec561acf36922d3fe71e8ad7fdc /queen/cutaway.h | |
parent | 2e60628c1f80fc6ebbc1ec0a5f75ad637bef4bdc (diff) | |
download | scummvm-rg350-ba281b251af3f9db2305517a20541fab182440c3.tar.gz scummvm-rg350-ba281b251af3f9db2305517a20541fab182440c3.tar.bz2 scummvm-rg350-ba281b251af3f9db2305517a20541fab182440c3.zip |
- Integrate with Joost's and Gregory's latest implementations.
- Implement more...
svn-id: r10771
Diffstat (limited to 'queen/cutaway.h')
-rw-r--r-- | queen/cutaway.h | 33 |
1 files changed, 26 insertions, 7 deletions
diff --git a/queen/cutaway.h b/queen/cutaway.h index 81e5100591..8fc373fd25 100644 --- a/queen/cutaway.h +++ b/queen/cutaway.h @@ -26,9 +26,10 @@ namespace Queen { -class Resource; -class Logic; class Graphics; +class Logic; +class Resource; +class Walk; class Cutaway { public: @@ -38,7 +39,8 @@ class Cutaway { char *nextFilename, Graphics *graphics, Logic *logic, - Resource *resource); + Resource *resource, + Walk *walk); private: //! Collection of constants used by QueenCutaway enum { @@ -52,6 +54,7 @@ class Cutaway { MAX_BANK_NAME_COUNT = 5, MAX_FILENAME_LENGTH = 12, MAX_FILENAME_SIZE = (MAX_FILENAME_LENGTH + 1), + MAX_PERSON_FACE_COUNT = 12, MAX_STRING_LENGTH = 255, MAX_STRING_SIZE = (MAX_STRING_LENGTH + 1), LEFT = 1, @@ -121,9 +124,15 @@ class Cutaway { int16 image; }; - Logic *_logic; - Resource *_resource; - Graphics *_graphics; + struct PersonFace { + int16 index; + int16 image; + }; + + Graphics *_graphics; + Logic *_logic; + Resource *_resource; + Walk *_walk; //! Raw .cut file data (without 20 byte header) byte *_fileData; @@ -137,6 +146,9 @@ class Cutaway { //! Pointer to next sentence string in _fileData byte *_nextSentence; + //! ??? + bool _roomFade; + //! Number of cutaway objects at _cutawayData int _cutawayObjectCount; @@ -173,6 +185,12 @@ class Cutaway { //! Number of elements used in _personData array int _personDataCount; + //! Used by handlePersonRecord() + PersonFace _personFace[MAX_PERSON_FACE_COUNT]; + + //! Number of entries in _personFace array + int _personFaceCount; + //! Play this song when leaving cutaway int16 _lastSong; @@ -184,7 +202,8 @@ class Cutaway { const char *filename, Graphics *graphics, Logic *logic, - Resource *resource); + Resource *resource, + Walk *walk); ~Cutaway(); //! Run this cutaway object |