diff options
| author | Nicola Mettifogo | 2007-03-17 08:06:45 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2007-03-17 08:06:45 +0000 |
| commit | cb5c3840ed2233040a28cf5d99e17cb64d422a96 (patch) | |
| tree | f0f8a6f51b86bc43577adeabe3e9f1bdb3590b80 | |
| parent | 1f7e889fe977333c6abc2c4dc586a383c6258c90 (diff) | |
| download | scummvm-rg350-cb5c3840ed2233040a28cf5d99e17cb64d422a96.tar.gz scummvm-rg350-cb5c3840ed2233040a28cf5d99e17cb64d422a96.tar.bz2 scummvm-rg350-cb5c3840ed2233040a28cf5d99e17cb64d422a96.zip | |
minor cleanup
svn-id: r26161
| -rw-r--r-- | engines/parallaction/defs.h | 9 | ||||
| -rw-r--r-- | engines/parallaction/parallaction.cpp | 2 | ||||
| -rw-r--r-- | engines/parallaction/parallaction.h | 15 |
3 files changed, 8 insertions, 18 deletions
diff --git a/engines/parallaction/defs.h b/engines/parallaction/defs.h index 6faad6ebd6..587b211816 100644 --- a/engines/parallaction/defs.h +++ b/engines/parallaction/defs.h @@ -73,9 +73,16 @@ struct StaticCnv { struct Cnv { uint16 _width; // uint16 _height; // - byte** _array; // frames data byte** field_8; // unused uint16 _count; // # of frames + byte** _array; // frames data + +public: + byte* getFramePtr(uint16 index) { + if (index >= _count) + error("frame %i does not exist", index); + return _array[index]; + } }; struct Animation; diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp index 6a4dc51eeb..a11e88391a 100644 --- a/engines/parallaction/parallaction.cpp +++ b/engines/parallaction/parallaction.cpp @@ -58,8 +58,6 @@ uint32 _engineFlags = 0; char *_objectsNames[100]; Zone *_activeZone = NULL; - - uint16 _score = 1; uint32 _localFlags[120] = { 0 }; diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h index fdea5d404c..348ead7a87 100644 --- a/engines/parallaction/parallaction.h +++ b/engines/parallaction/parallaction.h @@ -118,20 +118,9 @@ extern uint16 _introSarcData2; // sarcophagus stuff to be saved extern char *_globalTable[]; extern char _saveData1[]; -//extern Point _firstPosition; // starting position after load game?? -//extern uint16 _firstFrame; // starting frame after load game?? extern byte _mouseHidden; extern uint32 _commandFlags; - - -//extern char _locationName[]; -//extern Node _walkNodes; -//extern Command *_aCommands; -//extern Command *_commands; -//extern char *_comment; -//extern char *_endComment; - extern char *_objectsNames[]; extern const char *_zoneTypeNames[]; extern const char *_zoneFlagNames[]; @@ -173,12 +162,8 @@ void freeCommands(Command*); void freeZones(Node *list); -void freeLocation(); - void runDialogue(SpeakData*); -void changeCharacter(const char *name); - WalkNode *buildWalkPath(uint16 x, uint16 y); Job *addJob(JobFn fn, void *parm, uint16 tag); |