diff options
author | Torbjörn Andersson | 2008-01-06 20:57:46 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2008-01-06 20:57:46 +0000 |
commit | 1ddc8ab0fa0f0479a50e6436f3ff9eaa0568e117 (patch) | |
tree | 149ddd228925ad074bc20d72e9e4245fb2d81018 /engines/parallaction/parallaction.h | |
parent | 5ff1ccabe6b587afa6233496e9f84ad653ceeac5 (diff) | |
download | scummvm-rg350-1ddc8ab0fa0f0479a50e6436f3ff9eaa0568e117.tar.gz scummvm-rg350-1ddc8ab0fa0f0479a50e6436f3ff9eaa0568e117.tar.bz2 scummvm-rg350-1ddc8ab0fa0f0479a50e6436f3ff9eaa0568e117.zip |
Indent with tabs instead of spaces.
svn-id: r30315
Diffstat (limited to 'engines/parallaction/parallaction.h')
-rw-r--r-- | engines/parallaction/parallaction.h | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h index abd0f9c93d..10750c0f8c 100644 --- a/engines/parallaction/parallaction.h +++ b/engines/parallaction/parallaction.h @@ -104,28 +104,28 @@ enum { }; enum EngineFlags { - kEngineQuit = (1 << 0), - kEnginePauseJobs = (1 << 1), - kEngineInventory = (1 << 2), - kEngineWalking = (1 << 3), + kEngineQuit = (1 << 0), + kEnginePauseJobs = (1 << 1), + kEngineInventory = (1 << 2), + kEngineWalking = (1 << 3), kEngineChangeLocation = (1 << 4), - kEngineBlockInput = (1 << 5), - kEngineDragging = (1 << 6), - kEngineTransformedDonna = (1 << 7) + kEngineBlockInput = (1 << 5), + kEngineDragging = (1 << 6), + kEngineTransformedDonna = (1 << 7) }; enum { - kEvNone = 0, - kEvEnterZone = 1, - kEvExitZone = 2, - kEvAction = 3, + kEvNone = 0, + kEvEnterZone = 1, + kEvExitZone = 2, + kEvAction = 3, kEvOpenInventory = 4, kEvCloseInventory = 5, kEvHoverInventory = 6, - kEvWalk = 7, - kEvQuitGame = 1000, - kEvSaveGame = 2000, - kEvLoadGame = 4000 + kEvWalk = 7, + kEvQuitGame = 1000, + kEvSaveGame = 2000, + kEvLoadGame = 4000 }; enum { @@ -215,7 +215,7 @@ struct Character { Animation _ani; Frames *_head; - Frames *_talk; + Frames *_talk; Frames *_objs; PathBuilder _builder; WalkNodeList *_walkPath; @@ -505,15 +505,15 @@ protected: // data struct InputData { uint16 _event; Common::Point _mousePos; - int16 _inventoryIndex; - Zone* _zone; - Label* _label; + int16 _inventoryIndex; + Zone* _zone; + Label* _label; }; - bool _mouseHidden; + bool _mouseHidden; // input-only - InputData _input; + InputData _input; bool _actionAfterWalk; // actived when the character needs to move before taking an action // these two could/should be merged as they carry on the same duty in two member functions, @@ -526,14 +526,14 @@ protected: // data JobList _jobs; - Common::String _saveFileName; + Common::String _saveFileName; bool _hasLocationSound; char _locationSound[50]; BackgroundInfo *_backgroundInfo; - Zone *_hoverZone; + Zone *_hoverZone; protected: // members @@ -687,12 +687,12 @@ public: private: void initFonts(); void freeFonts(); - void renameOldSavefiles(); - Common::String genSaveFileName(uint slot, bool oldStyle = false); - Common::InSaveFile *getInSaveFile(uint slot); - Common::OutSaveFile *getOutSaveFile(uint slot); - bool allPartsComplete(); - void setPartComplete(const Character& character); + void renameOldSavefiles(); + Common::String genSaveFileName(uint slot, bool oldStyle = false); + Common::InSaveFile *getInSaveFile(uint slot); + Common::OutSaveFile *getOutSaveFile(uint slot); + bool allPartsComplete(); + void setPartComplete(const Character& character); private: void changeLocation(char *location); @@ -839,13 +839,13 @@ protected: virtual void parseHearData(Script &script, Zone *z); virtual void parseSpeakData(Script &script, Zone *z); - void parseLocation(const char *filename); - char *parseComment(Script &script); - char *parseDialogueString(Script &script); + void parseLocation(const char *filename); + char *parseComment(Script &script); + char *parseDialogueString(Script &script); Dialogue *parseDialogue(Script &script); - void resolveDialogueForwards(Dialogue *dialogue, uint numQuestions, Table &forwards); - Answer *parseAnswer(Script &script); - Question *parseQuestion(Script &script); + void resolveDialogueForwards(Dialogue *dialogue, uint numQuestions, Table &forwards); + Answer *parseAnswer(Script &script); + Question *parseQuestion(Script &script); void parseZone(Script &script, ZoneList &list, char *name); void parseZoneTypeBlock(Script &script, Zone *z); |