diff options
| author | Jordi Vilalta Prat | 2008-01-27 19:47:41 +0000 |
|---|---|---|
| committer | Jordi Vilalta Prat | 2008-01-27 19:47:41 +0000 |
| commit | 66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985 (patch) | |
| tree | e27aadabecd8dd910884280e6559ff9c94c3d73c /engines/gob | |
| parent | 278857698dc7b1623096fe1ad12511dc4c886c7e (diff) | |
| download | scummvm-rg350-66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985.tar.gz scummvm-rg350-66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985.tar.bz2 scummvm-rg350-66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985.zip | |
Removed trailing spaces.
svn-id: r30664
Diffstat (limited to 'engines/gob')
| -rw-r--r-- | engines/gob/coktelvideo.h | 4 | ||||
| -rw-r--r-- | engines/gob/game.h | 2 | ||||
| -rw-r--r-- | engines/gob/goblin.cpp | 4 | ||||
| -rw-r--r-- | engines/gob/map.h | 4 | ||||
| -rw-r--r-- | engines/gob/module.mk | 2 | ||||
| -rw-r--r-- | engines/gob/mult.h | 2 | ||||
| -rw-r--r-- | engines/gob/music.h | 2 | ||||
| -rw-r--r-- | engines/gob/parse.h | 2 | ||||
| -rw-r--r-- | engines/gob/scenery.h | 4 | ||||
| -rw-r--r-- | engines/gob/sound.h | 4 |
10 files changed, 15 insertions, 15 deletions
diff --git a/engines/gob/coktelvideo.h b/engines/gob/coktelvideo.h index 936b92c8f1..2b67f649f6 100644 --- a/engines/gob/coktelvideo.h +++ b/engines/gob/coktelvideo.h @@ -74,7 +74,7 @@ public: struct State { /** Left-most value of the updated rectangle. */ int16 left; - /** Top-most value of the updated rectangle. */ + /** Top-most value of the updated rectangle. */ int16 top; /** Right-most value of the updated rectangle. */ int16 right; @@ -231,7 +231,7 @@ protected: Audio::AppendableAudioStream *_audioStream; Audio::SoundHandle _audioHandle; - + uint32 _frameLength; uint32 _lastFrameTime; diff --git a/engines/gob/game.h b/engines/gob/game.h index 89877668c9..5cf5e1bea6 100644 --- a/engines/gob/game.h +++ b/engines/gob/game.h @@ -215,7 +215,7 @@ protected: byte *_variablesSizesArray[5]; GobEngine *_vm; - + int16 adjustKey(int16 key); byte *loadLocTexts(int32 *dataSize = 0); diff --git a/engines/gob/goblin.cpp b/engines/gob/goblin.cpp index bf07551569..df5811150e 100644 --- a/engines/gob/goblin.cpp +++ b/engines/gob/goblin.cpp @@ -1757,7 +1757,7 @@ void Goblin::setState(int16 index, int16 state) { (_vm->_scenery->_animBottom - _vm->_scenery->_animTop) - (obj->goblinY + 1) / 2; } else { - *obj->pPosY = (obj->goblinY + 1) * _vm->_map->_tilesHeight - + *obj->pPosY = (obj->goblinY + 1) * _vm->_map->_tilesHeight - (_vm->_scenery->_animBottom - _vm->_scenery->_animTop); } *obj->pPosX = obj->goblinX * _vm->_map->_tilesWidth; @@ -1849,7 +1849,7 @@ void Goblin::move(int16 destX, int16 destY, int16 objIndex) { mouseY = _vm->_global->_inter_mouseY; if (_vm->_map->_bigTiles) mouseY += ((_vm->_global->_inter_mouseY / _vm->_map->_tilesHeight) + 1) / 2; - + gobDestX = mouseX / _vm->_map->_tilesWidth; gobDestY = mouseY / _vm->_map->_tilesHeight; diff --git a/engines/gob/map.h b/engines/gob/map.h index ac9f0d48a8..8a94de8da9 100644 --- a/engines/gob/map.h +++ b/engines/gob/map.h @@ -133,7 +133,7 @@ public: return _passMap[y * _mapWidth + x]; } - + virtual void setPass(int x, int y, int8 pass, int heightOff = -1) { if (!_passMap) return; @@ -167,7 +167,7 @@ public: heightOff = _passWidth; return _passMap[y * heightOff + x]; } - + virtual void setPass(int x, int y, int8 pass, int heightOff = -1) { if (!_passMap) return; diff --git a/engines/gob/module.mk b/engines/gob/module.mk index b51de90656..8a428b4d34 100644 --- a/engines/gob/module.mk +++ b/engines/gob/module.mk @@ -59,5 +59,5 @@ ifdef BUILD_PLUGINS PLUGIN := 1 endif -# Include common rules +# Include common rules include $(srcdir)/rules.mk diff --git a/engines/gob/mult.h b/engines/gob/mult.h index b3fa892f34..90f6e61f9a 100644 --- a/engines/gob/mult.h +++ b/engines/gob/mult.h @@ -197,7 +197,7 @@ public: int16 sndSlotsCount; int16 sndSlot[60]; - int16 frameRate; + int16 frameRate; Video::Color fadePal[5][16]; int16 animObjs[4][4]; diff --git a/engines/gob/music.h b/engines/gob/music.h index 80dbc49167..199ea515b0 100644 --- a/engines/gob/music.h +++ b/engines/gob/music.h @@ -63,7 +63,7 @@ public: bool endOfData() const { return !_playing; } bool endOfStream() const { return false; } int getRate() const { return _rate; } - + protected: static const char *_tracks[][2]; static const char *_trackFiles[]; diff --git a/engines/gob/parse.h b/engines/gob/parse.h index 61c3763ce4..7d451b5f79 100644 --- a/engines/gob/parse.h +++ b/engines/gob/parse.h @@ -36,7 +36,7 @@ public: virtual int16 parseVarIndex(void) = 0; virtual int16 parseValExpr(byte stopToken = 99) = 0; virtual int16 parseExpr(byte stopToken, byte *resultPtr) = 0; - + Parse(GobEngine *vm); virtual ~Parse() {} diff --git a/engines/gob/scenery.h b/engines/gob/scenery.h index 800d0dbd2b..290d67d2d5 100644 --- a/engines/gob/scenery.h +++ b/engines/gob/scenery.h @@ -120,13 +120,13 @@ public: void updateAnim(int16 layer, int16 frame, int16 animation, int16 flags, int16 drawDeltaX, int16 drawDeltaY, char doDraw); - void writeAnimLayerInfo(uint16 index, uint16 layer, + void writeAnimLayerInfo(uint16 index, uint16 layer, int16 varDX, int16 varDY, int16 varUnk0, int16 varFrames); int16 getStaticLayersCount(uint16 index); int16 getAnimLayersCount(uint16 index); StaticLayer *getStaticLayer(uint16 index, uint16 layer); AnimLayer *getAnimLayer(uint16 index, uint16 layer); - + virtual int16 loadAnim(char search); Scenery(GobEngine *vm); diff --git a/engines/gob/sound.h b/engines/gob/sound.h index b2691b2ce6..6780c201b5 100644 --- a/engines/gob/sound.h +++ b/engines/gob/sound.h @@ -71,7 +71,7 @@ public: uint32 fadeSize = fade ? _size / 2 : 0; return ((_size * repCount - fadeSize) * 1000) / frequency; } - + SoundDesc() : _data(0), _dataPtr(0), _size(0), _type(SOUND_SND), _source(SOUND_FILE), _repCount(0), _frequency(0), _flag(0), _id(0) {} @@ -129,7 +129,7 @@ protected: Audio::SoundHandle *_activeHandle; Audio::SoundHandle _compositionHandle; - + SoundDesc *_compositionSamples; int8 _compositionSampleCount; int16 _composition[50]; |
