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 | |
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
-rw-r--r-- | engines/parallaction/graphics.h | 16 | ||||
-rw-r--r-- | engines/parallaction/inventory.h | 2 | ||||
-rw-r--r-- | engines/parallaction/objects.h | 4 | ||||
-rw-r--r-- | engines/parallaction/parallaction.h | 70 |
4 files changed, 46 insertions, 46 deletions
diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h index 232c63ba42..fe9a24dd37 100644 --- a/engines/parallaction/graphics.h +++ b/engines/parallaction/graphics.h @@ -262,7 +262,7 @@ public: void backupGetBackground(GetData *data, int16 x, int16 y); void restoreGetBackground(const Common::Rect& r, byte *data); - int setLocationBalloon(char *text, bool endGame); + int setLocationBalloon(char *text, bool endGame); int setDialogueBalloon(char *text, uint16 winding, byte textColor); int setSingleBalloon(char *text, uint16 x, uint16 y, uint16 winding, byte textColor); void setBalloonText(uint id, char *text, byte textColor); @@ -289,12 +289,12 @@ public: // amiga specific void setHalfbriteMode(bool enable); - void setProjectorPos(int x, int y); + void setProjectorPos(int x, int y); // misc int16 queryMask(int16 v); void setFont(Font* font); - void setFontShadow(bool enable); + void setFontShadow(bool enable); void swapBuffers(); void updateScreen(); void setBackground(Graphics::Surface *surf); @@ -321,15 +321,15 @@ protected: Graphics::Surface *_buffers[NUM_BUFFERS]; MaskBuffer *_depthMask; Font *_font; - bool _fontShadow; + bool _fontShadow; bool _halfbrite; - Common::Point _hbCirclePos; - int _hbCircleRadius; + Common::Point _hbCirclePos; + int _hbCircleRadius; protected: - static int16 _dialogueBalloonX[5]; + static int16 _dialogueBalloonX[5]; struct Balloon { uint16 x; @@ -365,7 +365,7 @@ protected: void copyRect(uint width, uint height, byte *dst, uint dstPitch, byte *src, uint srcPitch); int createBalloon(int16 w, int16 h, int16 winding, uint16 borderThickness); - Balloon *getBalloon(uint id); + Balloon *getBalloon(uint id); void drawText(Graphics::Surface* surf, uint16 x, uint16 y, const char *text, byte color); bool drawWrappedText(Graphics::Surface* surf, char *text, byte color, int16 wrapwidth); diff --git a/engines/parallaction/inventory.h b/engines/parallaction/inventory.h index 99f77913ec..8a80c0f316 100644 --- a/engines/parallaction/inventory.h +++ b/engines/parallaction/inventory.h @@ -34,7 +34,7 @@ namespace Parallaction { class Parallaction; struct InventoryItem { - uint32 _id; // object name (lowest 16 bits are always zero) + uint32 _id; // object name (lowest 16 bits are always zero) uint16 _index; // index to frame in objs file }; diff --git a/engines/parallaction/objects.h b/engines/parallaction/objects.h index c62dedc829..41596e3e38 100644 --- a/engines/parallaction/objects.h +++ b/engines/parallaction/objects.h @@ -278,7 +278,7 @@ struct Zone { int16 _bottom; uint32 _type; uint32 _flags; - Label _label; + Label _label; uint16 field_2C; // unused uint16 field_2E; // unused TypeData u; @@ -393,7 +393,7 @@ struct Program { -struct Animation : public Zone { +struct Animation : public Zone { Common::Point _oldPos; Program *_program; 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); |