aboutsummaryrefslogtreecommitdiff
path: root/engines/access
diff options
context:
space:
mode:
authorEugene Sandulenko2016-10-09 14:59:58 +0200
committerEugene Sandulenko2016-10-09 14:59:58 +0200
commitdead4aa01446da2bf711e64a4e681be460fa1202 (patch)
tree149648f240e839900e18af10953c4408da1e9464 /engines/access
parentc5efd9f7487f4f51316d9ae6e6cbef3d35dd7b51 (diff)
downloadscummvm-rg350-dead4aa01446da2bf711e64a4e681be460fa1202.tar.gz
scummvm-rg350-dead4aa01446da2bf711e64a4e681be460fa1202.tar.bz2
scummvm-rg350-dead4aa01446da2bf711e64a4e681be460fa1202.zip
JANITORIAL: Remove trailing spaces
Diffstat (limited to 'engines/access')
-rw-r--r--engines/access/amazon/amazon_logic.cpp4
-rw-r--r--engines/access/amazon/amazon_room.h2
-rw-r--r--engines/access/animation.h2
-rw-r--r--engines/access/asurface.cpp2
-rw-r--r--engines/access/debugger.cpp2
-rw-r--r--engines/access/decompress.cpp2
-rw-r--r--engines/access/events.cpp8
-rw-r--r--engines/access/files.h2
-rw-r--r--engines/access/inventory.h2
-rw-r--r--engines/access/player.cpp2
-rw-r--r--engines/access/screen.cpp4
-rw-r--r--engines/access/scripts.cpp6
-rw-r--r--engines/access/scripts.h6
-rw-r--r--engines/access/sound.cpp2
-rw-r--r--engines/access/video.cpp2
15 files changed, 24 insertions, 24 deletions
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 08006fe1b7..5a0f79721e 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1333,7 +1333,7 @@ void Cast::doCast(int param1) {
for (int idx = 0; idx < 5 && !_vm->shouldQuit() &&
!_vm->_events->isKeyMousePressed(); ++idx)
_vm->_events->pollEventsAndWait();
-
+
if (_vm->_events->isKeyMousePressed())
break;
@@ -1682,7 +1682,7 @@ void River::updateObstacles() {
void River::riverSetPhysX() {
int xAmt = (_vm->_scrollCol * 16) + _vm->_scrollX;
-
+
for (RiverStruct *cur = _topList; cur <= _botList; ++cur) {
cur->_xp = xAmt - (_screenVertX - cur->_riverX);
}
diff --git a/engines/access/amazon/amazon_room.h b/engines/access/amazon/amazon_room.h
index 6396f80199..003178ea15 100644
--- a/engines/access/amazon/amazon_room.h
+++ b/engines/access/amazon/amazon_room.h
@@ -61,7 +61,7 @@ public:
virtual ~AmazonRoom();
virtual void init4Quads();
-
+
virtual void roomMenu();
};
diff --git a/engines/access/animation.h b/engines/access/animation.h
index 72621c4d11..49417ec5fc 100644
--- a/engines/access/animation.h
+++ b/engines/access/animation.h
@@ -49,7 +49,7 @@ public:
~AnimationManager();
void freeAnimationData();
void loadAnimations(Resource *res);
-
+
Animation *findAnimation(int animId);
Animation *setAnimation(int animId);
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index 37f4c7082e..577746f7b4 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -173,7 +173,7 @@ void BaseSurface::copyTo(BaseSurface *dest) {
if (dest->empty())
dest->create(this->w, this->h);
- dest->blitFrom(*this);
+ dest->blitFrom(*this);
}
void BaseSurface::saveBlock(const Common::Rect &bounds) {
diff --git a/engines/access/debugger.cpp b/engines/access/debugger.cpp
index 48c7290249..308733ece2 100644
--- a/engines/access/debugger.cpp
+++ b/engines/access/debugger.cpp
@@ -94,7 +94,7 @@ bool Debugger::Cmd_LoadScene(int argc, const char **argv) {
debugPrintf("Unused Room Number\n");
return true;
}
-
+
_vm->_player->_roomNumber = newRoom;
_vm->_room->_function = FN_CLEAR1;
diff --git a/engines/access/decompress.cpp b/engines/access/decompress.cpp
index 3de376c193..6d5b613fe2 100644
--- a/engines/access/decompress.cpp
+++ b/engines/access/decompress.cpp
@@ -31,7 +31,7 @@ namespace Access {
void LzwDecompressor::decompress(byte *source, byte *dest) {
_source = source;
-
+
byte litByte = 0;
uint16 oldCode = 0;
uint16 copyLength, maxCodeValue, code, nextCode, lastCode;
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 21ff0d0928..3d3b97e028 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -65,9 +65,9 @@ void EventsManager::setNormalCursor(CursorType cursorId) {
void EventsManager::setCursor(CursorType cursorId) {
if (cursorId == _cursorId)
- return;
+ return;
_cursorId = cursorId;
-
+
if (cursorId == CURSOR_INVENTORY) {
// Set the cursor
CursorMan.replaceCursor(_invCursor.getPixels(), _invCursor.w, _invCursor.h,
@@ -209,9 +209,9 @@ void EventsManager::keyControl(Common::KeyCode keycode, bool isKeyDown) {
}
return;
}
-
+
_keyCode = keycode;
-
+
switch (keycode) {
case Common::KEYCODE_UP:
case Common::KEYCODE_KP8:
diff --git a/engines/access/files.h b/engines/access/files.h
index 61fccc2431..151890f338 100644
--- a/engines/access/files.h
+++ b/engines/access/files.h
@@ -77,7 +77,7 @@ private:
* Handles setting up the resource with a stream for the located resource
*/
void handleFile(Resource *res);
-
+
/**
* Handles loading a screen surface and palette with decoded resource
*/
diff --git a/engines/access/inventory.h b/engines/access/inventory.h
index 1d88bf4555..e91ca2484e 100644
--- a/engines/access/inventory.h
+++ b/engines/access/inventory.h
@@ -119,7 +119,7 @@ public:
int _startTravelItem;
public:
InventoryManager(AccessEngine *vm);
-
+
int &operator[](int idx);
int useItem();
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 0162491aee..ccef0d6740 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -142,7 +142,7 @@ void Player::loadTexPalette() {
int size = texPal->_size;
assert(size == 768);
_manPal1 = new byte[size];
- memcpy(_manPal1, texPal->data(), size);
+ memcpy(_manPal1, texPal->data(), size);
}
void Player::loadSprites(const Common::String &name) {
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 2d29ad0718..7da9dfc429 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -300,10 +300,10 @@ void Screen::cyclePaletteBackwards() {
_vm->_timers[6]._flag++;
byte *pStart = &_rawPalette[_cycleStart * 3];
byte *pEnd = &_rawPalette[_endCycle * 3];
-
+
for (int idx = _startCycle; idx < _endCycle; ++idx) {
g_system->getPaletteManager()->setPalette(pStart, idx, 1);
-
+
pStart += 3;
if (pStart == pEnd)
pStart = &_rawPalette[_cycleStart * 3];
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 38313640f1..2cebc3e3c6 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -840,7 +840,7 @@ void Scripts::cmdTexChoice() {
_vm->_fonts._charSet._lo = 1;
_vm->_fonts._charSet._hi = 8;
_vm->_fonts._charFor._hi = 255;
-
+
if (_vm->getGameID() == GType_MartianMemorandum) {
_vm->_fonts._charFor._lo = 247;
_vm->_screen->_maxChars = 23;
@@ -912,7 +912,7 @@ void Scripts::cmdTexChoice() {
_vm->_events->debounceLeft();
int x = _vm->_events->_mousePos.x;
for (int i = 0; i < BTN_COUNT; i++) {
- if (((_vm->getGameID() == GType_MartianMemorandum) && (x >= BTN_RANGES_v1[i][0]) && (x < BTN_RANGES_v1[i][1]))
+ if (((_vm->getGameID() == GType_MartianMemorandum) && (x >= BTN_RANGES_v1[i][0]) && (x < BTN_RANGES_v1[i][1]))
|| ((_vm->getGameID() == GType_Amazon) && (x >= BTN_RANGES_v2[i][0]) && (x < BTN_RANGES_v2[i][1]))) {
choice = i;
@@ -1049,7 +1049,7 @@ void Scripts::cmdDispAbout() {
if (btnSelected == 2)
_vm->_useItem = -1;
else
- _vm->_useItem = _vm->_travelBox->_tempListIdx[boxX];
+ _vm->_useItem = _vm->_travelBox->_tempListIdx[boxX];
}
void Scripts::cmdPushLocation() {
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 4cfedf3b3f..ad9cb8661e 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -73,12 +73,12 @@ protected:
void cmdAnim();
void cmdSetFlag();
void cmdCheckFlag();
-
+
/**
* Jump to another script
*/
void cmdGoto();
-
+
void cmdAddScore();
void cmdSetInventory();
void cmdCheckInventory();
@@ -162,7 +162,7 @@ public:
void freeScriptData();
void searchForSequence();
-
+
int executeScript();
void findNull();
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index cf52bc58c5..baa14ce21e 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -155,7 +155,7 @@ void SoundManager::playSound(Resource *res, int priority, bool loop, int soundIn
error("Unknown format");
if (loop) {
- _queue.push_back(QueuedSound(new Audio::LoopingAudioStream(audioStream, 0,
+ _queue.push_back(QueuedSound(new Audio::LoopingAudioStream(audioStream, 0,
DisposeAfterUse::NO), soundIndex));
} else {
_queue.push_back(QueuedSound(audioStream, soundIndex));
diff --git a/engines/access/video.cpp b/engines/access/video.cpp
index 22842a5855..54231a9efe 100644
--- a/engines/access/video.cpp
+++ b/engines/access/video.cpp
@@ -97,7 +97,7 @@ void VideoPlayer::setVideo(BaseSurface *vidSurface, const Common::Point &pt, con
void VideoPlayer::setVideo(BaseSurface *vidSurface, const Common::Point &pt, const FileIdent &videoFile, int rate) {
// Open up video stream
_videoData = _vm->_files->loadFile(videoFile);
-
+
setVideo(vidSurface, pt, rate);
}