[Scummvm-cvs-logs] scummvm master -> e8ffcdc09cc97c89619511e7e9f216073e7ffc69
Strangerke
Strangerke at scummvm.org
Sat Jun 7 17:13:32 CEST 2014
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e8ffcdc09c AVALANCHE: Janitorial - remove trailing spaces and tabs
Commit: e8ffcdc09cc97c89619511e7e9f216073e7ffc69
https://github.com/scummvm/scummvm/commit/e8ffcdc09cc97c89619511e7e9f216073e7ffc69
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-06-07T17:12:24+02:00
Commit Message:
AVALANCHE: Janitorial - remove trailing spaces and tabs
Changed paths:
engines/avalanche/avalot.cpp
engines/avalanche/dialogs.cpp
engines/avalanche/ghostroom.h
engines/avalanche/graphics.cpp
engines/avalanche/help.cpp
engines/avalanche/module.mk
engines/avalanche/nim.cpp
engines/avalanche/parser.cpp
engines/avalanche/shootemup.cpp
diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index c8f5599..0ffe7d3 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -217,7 +217,7 @@ void AvalancheEngine::setup() {
delete mainmenu;
if (_letMeOut)
return;
-
+
newGame();
thinkAbout(kObjectMoney, kThing);
diff --git a/engines/avalanche/dialogs.cpp b/engines/avalanche/dialogs.cpp
index e843d17..f954409 100644
--- a/engines/avalanche/dialogs.cpp
+++ b/engines/avalanche/dialogs.cpp
@@ -105,7 +105,7 @@ void Dialogs::setReadyLight(byte state) {
color = kColorGreen;
break; // Hit a key
}
-
+
_vm->_graphics->drawReadyLight(color);
CursorMan.showMouse(true);
_vm->_ledStatus = state;
diff --git a/engines/avalanche/ghostroom.h b/engines/avalanche/ghostroom.h
index 4c65912..ca1e8ac 100644
--- a/engines/avalanche/ghostroom.h
+++ b/engines/avalanche/ghostroom.h
@@ -56,7 +56,7 @@ private:
static const byte kWaveOrder[5];
static const byte kGlerkFade[26];
static const byte kGreldetFade[18];
-
+
Common::Point dummyCoord;
byte ****_ghost;// [5][2][66][26]
Graphics::Surface _eyes[2];
diff --git a/engines/avalanche/graphics.cpp b/engines/avalanche/graphics.cpp
index 67a7061..60c2359 100644
--- a/engines/avalanche/graphics.cpp
+++ b/engines/avalanche/graphics.cpp
@@ -533,7 +533,7 @@ void GraphicManager::ghostDrawMonster(byte ***picture, uint16 destX, int16 destY
// Only for the Ghost:
const byte kPlaneToUse[4] = { 0, 0, 0, 1 };
int yStart = 0;
-
+
// Constants from the original code:
switch (type) {
case kMonsterTypeGhost:
@@ -820,7 +820,7 @@ void GraphicManager::menuLoadPictures() {
int height = 33;
int width = 9 * 8;
-
+
for (int plane = 0; plane < 4; plane++) {
// The icons themselves:
int n = 0;
@@ -853,7 +853,7 @@ void GraphicManager::menuLoadPictures() {
_menu.fillRect(Common::Rect(114, 70 + i * 33, 584, 73 + i * 33), kColorWhite);
_menu.fillRect(Common::Rect(114, 100 + i * 33, 584, 103 + i * 33), kColorDarkgray);
}
-
+
file.close();
// The title on the top of the screen:
diff --git a/engines/avalanche/help.cpp b/engines/avalanche/help.cpp
index 9b077eb..4d08e3d 100644
--- a/engines/avalanche/help.cpp
+++ b/engines/avalanche/help.cpp
@@ -196,9 +196,9 @@ bool Help::handleMouse(const Common::Event &event) {
}
// Erase the previous highlight only if it's needed:
- if (_highlightWas != highlightIs)
+ if (_highlightWas != highlightIs)
_vm->_graphics->helpDrawHighlight(_highlightWas, kColorBlue);
-
+
// Highlight the current one with the proper color:
if ((highlightIs != 177) && (_buttons[highlightIs]._trigger != Common::KEYCODE_INVALID)) {
_highlightWas = highlightIs;
diff --git a/engines/avalanche/module.mk b/engines/avalanche/module.mk
index 29bc039..919ff03 100644
--- a/engines/avalanche/module.mk
+++ b/engines/avalanche/module.mk
@@ -22,7 +22,7 @@ MODULE_OBJS = \
shootemup.o \
mainmenu.o \
highscore.o
-
+
# This module can be built as a plugin
ifeq ($(ENABLE_AVALANCHE), DYNAMIC_PLUGIN)
PLUGIN := 1
diff --git a/engines/avalanche/nim.cpp b/engines/avalanche/nim.cpp
index 9457a50..79be16d 100644
--- a/engines/avalanche/nim.cpp
+++ b/engines/avalanche/nim.cpp
@@ -77,7 +77,7 @@ void Nim::playNim() {
_vm->_dialogs->displayScrollChain('Q', 3);
_playedNim++;
-
+
_vm->_graphics->saveScreen();
_vm->fadeOut();
@@ -87,7 +87,7 @@ void Nim::playNim() {
//CursorMan.showMouse(true);
do {
-
+
startMove();
if (_dogfoodsTurn)
dogFood();
@@ -122,7 +122,7 @@ void Nim::playNim() {
_vm->refreshObjectList();
_vm->_wonNim = true;
_vm->_background->draw(-1, -1, 0); // Show the settle with no lute on it.
-
+
// 7 points for winning!
_vm->incScore(7);
}
@@ -135,7 +135,7 @@ void Nim::playNim() {
void Nim::chalk(int x, int y, Common::String text) {
const Color greys[] = { kColorBlack, kColorDarkgray, kColorLightgray, kColorWhite };
-
+
for (int i = 0; i < 4; i++) {
_vm->_graphics->drawNormalText(text, _vm->_font, 8, x - i, y, greys[i]);
_vm->_graphics->refreshScreen();
@@ -159,7 +159,7 @@ void Nim::setup() {
// Bottom right rectangle.
_vm->_graphics->drawRectangle(Common::Rect(394, 50, 635, 198), kColorRed);
_vm->_graphics->drawFilledRectangle(Common::Rect(395, 51, 634, 197), kColorBrown);
-
+
_vm->_graphics->nimDrawLogo();
_vm->_graphics->nimDrawInitials();
@@ -167,7 +167,7 @@ void Nim::setup() {
_vm->_graphics->drawNormalText("Turn:", _vm->_font, 8, 420, 55, kColorYellow);
_vm->_graphics->drawNormalText("Player:", _vm->_font, 8, 490, 55, kColorYellow);
_vm->_graphics->drawNormalText("Move:", _vm->_font, 8, 570, 55, kColorYellow);
-
+
chalk(27, 7, "Take pieces away with:");
chalk(77, 17, "1) the mouse (click leftmost)");
chalk(53, 27, "or 2) the keyboard:");
@@ -364,7 +364,7 @@ bool Nim::checkInput() {
void Nim::takeSome() {
_number = 1;
-
+
do {
byte sr;
do {
@@ -377,7 +377,7 @@ void Nim::takeSome() {
_number = 1;
}
} while (sr == 0);
-
+
if (_number > sr)
_number = sr;
@@ -391,7 +391,7 @@ void Nim::takeSome() {
bool confirm = false;
do {
confirm = checkInput();
-
+
if (!confirm) {
_vm->_graphics->drawRectangle(Common::Rect(x1, y1, x2, y2), kColorBlack); // Erase the previous selection.
x1 = 63 + (_stones[_row] - _number) * 64;
@@ -402,7 +402,7 @@ void Nim::takeSome() {
_vm->_graphics->refreshScreen();
}
} while (!confirm);
-
+
return;
} while (true);
diff --git a/engines/avalanche/parser.cpp b/engines/avalanche/parser.cpp
index b152747..220186c 100644
--- a/engines/avalanche/parser.cpp
+++ b/engines/avalanche/parser.cpp
@@ -2495,7 +2495,7 @@ void Parser::synchronize(Common::Serializer &sz) {
sz.syncAsByte(_sworeNum);
sz.syncAsByte(_alcoholLevel);
if (sz.isLoading() && sz.getVersion() < 2) {
- int dummy;
+ int dummy;
sz.syncAsByte(dummy);
}
sz.syncAsByte(_boughtOnion);
diff --git a/engines/avalanche/shootemup.cpp b/engines/avalanche/shootemup.cpp
index cabd19d..e5e44ed 100644
--- a/engines/avalanche/shootemup.cpp
+++ b/engines/avalanche/shootemup.cpp
@@ -116,7 +116,7 @@ uint16 ShootEmUp::run() {
}
setup();
-
+
while ((_time != 0) && (!_vm->shouldQuit())) {
uint32 beginLoop = _vm->_system->getMillis();
@@ -142,7 +142,7 @@ uint16 ShootEmUp::run() {
if (delay <= 55)
_vm->_system->delayMillis(55 - delay); // Replaces slowdown(); 55 comes from 18.2 Hz (B Flight).
};
-
+
_vm->fadeOut();
_vm->_graphics->restoreScreen();
_vm->_graphics->removeBackup();
More information about the Scummvm-git-logs
mailing list