diff options
author | Willem Jan Palenstijn | 2010-04-02 22:14:18 +0000 |
---|---|---|
committer | Willem Jan Palenstijn | 2010-04-02 22:14:18 +0000 |
commit | fe51070977e01c0ab20807acf7a30388ee74ae6e (patch) | |
tree | 8fff40ec83e8ea32b464706e53fca16739612cb7 /engines/parallaction | |
parent | 4e9183cc1bc4f130222aa5cbb953970606a5536e (diff) | |
download | scummvm-rg350-fe51070977e01c0ab20807acf7a30388ee74ae6e.tar.gz scummvm-rg350-fe51070977e01c0ab20807acf7a30388ee74ae6e.tar.bz2 scummvm-rg350-fe51070977e01c0ab20807acf7a30388ee74ae6e.zip |
Fix whitespace
svn-id: r48477
Diffstat (limited to 'engines/parallaction')
-rw-r--r-- | engines/parallaction/balloons.cpp | 2 | ||||
-rw-r--r-- | engines/parallaction/dialogue.cpp | 2 | ||||
-rw-r--r-- | engines/parallaction/graphics.cpp | 2 | ||||
-rw-r--r-- | engines/parallaction/graphics.h | 2 | ||||
-rw-r--r-- | engines/parallaction/gui_br.cpp | 10 | ||||
-rw-r--r-- | engines/parallaction/parallaction_br.cpp | 10 | ||||
-rw-r--r-- | engines/parallaction/parallaction_ns.cpp | 26 | ||||
-rw-r--r-- | engines/parallaction/walk.cpp | 2 | ||||
-rw-r--r-- | engines/parallaction/walk.h | 10 |
9 files changed, 33 insertions, 33 deletions
diff --git a/engines/parallaction/balloons.cpp b/engines/parallaction/balloons.cpp index c6e41b8f72..95f85f6cff 100644 --- a/engines/parallaction/balloons.cpp +++ b/engines/parallaction/balloons.cpp @@ -751,7 +751,7 @@ void Parallaction_ns::setupBalloonManager() { } void Parallaction_br::setupBalloonManager() { - _balloonMan = new BalloonManager_br(this, _dialogueFont); + _balloonMan = new BalloonManager_br(this, _dialogueFont); } diff --git a/engines/parallaction/dialogue.cpp b/engines/parallaction/dialogue.cpp index da9dfbe1d9..ee877ce98e 100644 --- a/engines/parallaction/dialogue.cpp +++ b/engines/parallaction/dialogue.cpp @@ -480,7 +480,7 @@ void Parallaction::exitDialogueMode() { /* Since the current instance of _dialogueMan must be destroyed before the zone commands are executed, as they may create a new instance of _dialogueMan that would overwrite the current, we need to save the references to the command lists. - */ + */ CommandList *_cmdList = _dialogueMan->_cmdList; ZonePtr z = _dialogueMan->_z; diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp index 078f696f3b..d5e798572d 100644 --- a/engines/parallaction/graphics.cpp +++ b/engines/parallaction/graphics.cpp @@ -799,7 +799,7 @@ GfxObj* Gfx::registerBalloon(Frames *frames, const char *text) { void Gfx::freeDialogueObjects() { _items.clear(); - _vm->_balloonMan->reset(); + _vm->_balloonMan->reset(); for (uint i = 0; i < _balloons.size(); i++) { delete _balloons[i]; diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h index 228b0add39..ba71656945 100644 --- a/engines/parallaction/graphics.h +++ b/engines/parallaction/graphics.h @@ -440,7 +440,7 @@ public: void freeCharacterObjects(); void freeLocationObjects(); void showGfxObj(GfxObj* obj, bool visible); - void blt(const Common::Rect& r, byte *data, Graphics::Surface *surf, uint16 z, uint scale, byte transparentColor); + void blt(const Common::Rect& r, byte *data, Graphics::Surface *surf, uint16 z, uint scale, byte transparentColor); void unpackBlt(const Common::Rect& r, byte *data, uint size, Graphics::Surface *surf, uint16 z, uint scale, byte transparentColor); // labels diff --git a/engines/parallaction/gui_br.cpp b/engines/parallaction/gui_br.cpp index 0bc92efc45..7096bbe569 100644 --- a/engines/parallaction/gui_br.cpp +++ b/engines/parallaction/gui_br.cpp @@ -164,11 +164,11 @@ class MainMenuInputState_BR : public MenuInputState { int _selection; void cleanup() { - _vm->_gfx->freeDialogueObjects(); + _vm->_gfx->freeDialogueObjects(); for (int i = 0; i < _availItems; i++) { delete _lines[i]; - _lines[i] = 0; + _lines[i] = 0; } } @@ -194,9 +194,9 @@ public: memset(_lines, 0, sizeof(_lines)); } - ~MainMenuInputState_BR() { - cleanup(); - } + ~MainMenuInputState_BR() { + cleanup(); + } virtual MenuInputState* run() { int event = _vm->_input->getLastButtonEvent(); diff --git a/engines/parallaction/parallaction_br.cpp b/engines/parallaction/parallaction_br.cpp index 80090f3f0b..acfb3b583e 100644 --- a/engines/parallaction/parallaction_br.cpp +++ b/engines/parallaction/parallaction_br.cpp @@ -264,12 +264,12 @@ void Parallaction_br::cleanupGame() { void Parallaction_br::changeLocation() { - if (_newLocationName.empty()) { - return; - } + if (_newLocationName.empty()) { + return; + } - char location[200]; - strcpy(location, _newLocationName.c_str()); + char location[200]; + strcpy(location, _newLocationName.c_str()); char *partStr = strrchr(location, '.'); if (partStr) { diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp index d79e89cbc6..2ce69abb84 100644 --- a/engines/parallaction/parallaction_ns.cpp +++ b/engines/parallaction/parallaction_ns.cpp @@ -94,19 +94,19 @@ public: /* bind accept the following input formats: - 1 - [S].slide.[L]{.[C]} + 1 - [S].slide.[L]{.[C]} 2 - [L]{.[C]} - where: + where: [S] is the slide to be shown - [L] is the location to switch to (immediately in case 2, or right after slide [S] in case 1) - [C] is the character to be selected, and is optional + [L] is the location to switch to (immediately in case 2, or right after slide [S] in case 1) + [C] is the character to be selected, and is optional - The routine tells one form from the other by searching for the '.slide.' + The routine tells one form from the other by searching for the '.slide.' - NOTE: there exists one script in which [L] is not used in the case 1, but its use - is commented out, and would definitely crash the current implementation. + NOTE: there exists one script in which [L] is not used in the case 1, but its use + is commented out, and would definitely crash the current implementation. */ void LocationName::bind(const char *s) { @@ -324,13 +324,13 @@ void Parallaction_ns::runPendingZones() { // between one and the other. // void Parallaction_ns::changeLocation() { - if (_newLocationName.empty()) { - return; - } + if (_newLocationName.empty()) { + return; + } - char location[200]; - strcpy(location, _newLocationName.c_str()); - strcpy(_location._name, _newLocationName.c_str()); + char location[200]; + strcpy(location, _newLocationName.c_str()); + strcpy(_location._name, _newLocationName.c_str()); debugC(1, kDebugExec, "changeLocation(%s)", location); diff --git a/engines/parallaction/walk.cpp b/engines/parallaction/walk.cpp index 485f85490b..f20d4af7a7 100644 --- a/engines/parallaction/walk.cpp +++ b/engines/parallaction/walk.cpp @@ -164,7 +164,7 @@ uint32 PathWalker_NS::buildSubPath(const Common::Point& pos, const Common::Point void PathWalker_NS::buildPath(AnimationPtr a, uint16 x, uint16 y) { debugC(1, kDebugWalk, "PathBuilder::buildPath to (%i, %i)", x, y); - _a = a; + _a = a; _walkPath.clear(); diff --git a/engines/parallaction/walk.h b/engines/parallaction/walk.h index 3dd9ead3a4..15ef69163a 100644 --- a/engines/parallaction/walk.h +++ b/engines/parallaction/walk.h @@ -38,26 +38,26 @@ struct Character; class PathWalker_NS { - AnimationPtr _a; + AnimationPtr _a; PointList _walkPath; int16 _direction, _step; - // builder routines + // builder routines PointList _subPath; void correctPathPoint(Common::Point &to); uint32 buildSubPath(const Common::Point& pos, const Common::Point& stop); uint16 walkFunc1(const Common::Point &to, Common::Point& node); - // walker routines + // walker routines void finalizeWalk(); void clipMove(Common::Point& pos, const Common::Point& to); void checkDoor(const Common::Point &foot); - void updateDirection(const Common::Point& pos, const Common::Point& to); + void updateDirection(const Common::Point& pos, const Common::Point& to); public: PathWalker_NS(); - void buildPath(AnimationPtr a, uint16 x, uint16 y); + void buildPath(AnimationPtr a, uint16 x, uint16 y); void walk(); }; |