[Scummvm-cvs-logs] SF.net SVN: scummvm: [30315] scummvm/trunk/engines/parallaction
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Sun Jan 6 21:57:46 CET 2008
Revision: 30315
http://scummvm.svn.sourceforge.net/scummvm/?rev=30315&view=rev
Author: eriktorbjorn
Date: 2008-01-06 12:57:46 -0800 (Sun, 06 Jan 2008)
Log Message:
-----------
Indent with tabs instead of spaces.
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/graphics.h
scummvm/trunk/engines/parallaction/inventory.h
scummvm/trunk/engines/parallaction/objects.h
scummvm/trunk/engines/parallaction/parallaction.h
Modified: scummvm/trunk/engines/parallaction/graphics.h
===================================================================
--- scummvm/trunk/engines/parallaction/graphics.h 2008-01-06 20:51:05 UTC (rev 30314)
+++ scummvm/trunk/engines/parallaction/graphics.h 2008-01-06 20:57:46 UTC (rev 30315)
@@ -262,7 +262,7 @@
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 @@
// 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 @@
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 @@
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);
Modified: scummvm/trunk/engines/parallaction/inventory.h
===================================================================
--- scummvm/trunk/engines/parallaction/inventory.h 2008-01-06 20:51:05 UTC (rev 30314)
+++ scummvm/trunk/engines/parallaction/inventory.h 2008-01-06 20:57:46 UTC (rev 30315)
@@ -34,7 +34,7 @@
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
};
Modified: scummvm/trunk/engines/parallaction/objects.h
===================================================================
--- scummvm/trunk/engines/parallaction/objects.h 2008-01-06 20:51:05 UTC (rev 30314)
+++ scummvm/trunk/engines/parallaction/objects.h 2008-01-06 20:57:46 UTC (rev 30315)
@@ -278,7 +278,7 @@
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 Animation : public Zone {
+struct Animation : public Zone {
Common::Point _oldPos;
Program *_program;
Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h 2008-01-06 20:51:05 UTC (rev 30314)
+++ scummvm/trunk/engines/parallaction/parallaction.h 2008-01-06 20:57:46 UTC (rev 30315)
@@ -104,28 +104,28 @@
};
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 @@
Animation _ani;
Frames *_head;
- Frames *_talk;
+ Frames *_talk;
Frames *_objs;
PathBuilder _builder;
WalkNodeList *_walkPath;
@@ -505,15 +505,15 @@
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 @@
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 @@
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 @@
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);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list