aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2013-11-22 21:40:16 +0100
committerStrangerke2013-11-22 21:40:16 +0100
commit11c15bea004cac31ade82679c31958c63f22a5ce (patch)
treeb87daefe4a0b1415838060e500a80f8c454667a5
parent93e5d415c6818ada219e3848a5e10ac98087e158 (diff)
downloadscummvm-rg350-11c15bea004cac31ade82679c31958c63f22a5ce.tar.gz
scummvm-rg350-11c15bea004cac31ade82679c31958c63f22a5ce.tar.bz2
scummvm-rg350-11c15bea004cac31ade82679c31958c63f22a5ce.zip
AVALANCHE: Janitorial - Remove extra blank lines
-rw-r--r--engines/avalanche/avalot.cpp3
-rw-r--r--engines/avalanche/console.cpp1
-rw-r--r--engines/avalanche/dialogs.cpp1
-rw-r--r--engines/avalanche/enums.h1
-rw-r--r--engines/avalanche/graphics.cpp17
-rw-r--r--engines/avalanche/parser.cpp4
-rw-r--r--engines/avalanche/parser.h1
7 files changed, 8 insertions, 20 deletions
diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index 568f950604..27c02449e2 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -199,7 +199,6 @@ void Clock::chime() {
}
}
-
void AvalancheEngine::handleKeyDown(Common::Event &event) {
_sound->click();
@@ -576,7 +575,6 @@ void AvalancheEngine::exitRoom(byte x) {
_lastRoomNotMap = _room;
}
-
/**
* Only when entering a NEW town! Not returning to the last one,
* but choosing another from the map.
@@ -1341,7 +1339,6 @@ void AvalancheEngine::drawDirection() { // It's data is loaded in load_digits().
CursorMan.showMouse(true);
}
-
void AvalancheEngine::gameOver() {
_userMovesAvvy = false;
diff --git a/engines/avalanche/console.cpp b/engines/avalanche/console.cpp
index 656cc1907c..e4b52116e4 100644
--- a/engines/avalanche/console.cpp
+++ b/engines/avalanche/console.cpp
@@ -50,5 +50,4 @@ bool AvalancheConsole::Cmd_MagicLines(int argc, const char **argv) {
return false;
}
-
} // End of namespace Avalanche
diff --git a/engines/avalanche/dialogs.cpp b/engines/avalanche/dialogs.cpp
index e5d2bf678c..24faa47eb7 100644
--- a/engines/avalanche/dialogs.cpp
+++ b/engines/avalanche/dialogs.cpp
@@ -190,7 +190,6 @@ void Dialogs::scrollModeNormal() {
break;
} while (!((mrelease > 0) || (buttona1()) || (buttonb1())));
-
if (mrelease == 0) {
inkey();
if (aboutscroll) {
diff --git a/engines/avalanche/enums.h b/engines/avalanche/enums.h
index dbb3d70034..2b5db67609 100644
--- a/engines/avalanche/enums.h
+++ b/engines/avalanche/enums.h
@@ -127,7 +127,6 @@ static const int16 kScreenHeight = 200;
static const int16 kWalk = 3;
static const int16 kRun = 5;
-
} // End of namespace Avalanche
#endif // AVALANCHE_ENUMS_H
diff --git a/engines/avalanche/graphics.cpp b/engines/avalanche/graphics.cpp
index e5a3d119ae..841512847f 100644
--- a/engines/avalanche/graphics.cpp
+++ b/engines/avalanche/graphics.cpp
@@ -36,15 +36,15 @@ namespace Avalanche {
const byte GraphicManager::kEgaPaletteIndex[16] = {0, 1, 2, 3, 4, 5, 20, 7, 56, 57, 58, 59, 60, 61, 62, 63};
const MouseHotspotType GraphicManager::kMouseHotSpots[9] = {
- {8,0}, // 0 - up-arrow
- {0,0}, // 1 - screwdriver
+ {8,0}, // 0 - up-arrow
+ {0,0}, // 1 - screwdriver
{15,6}, // 2 - right-arrow
- {0,0}, // 3 - fletch
- {8,7}, // 4 - hourglass
- {4,0}, // 5 - TTHand
- {8,5}, // 6 - Mark's crosshairs
- {8,7}, // 7 - I-beam
- {0,0} // 8 - question mark
+ {0,0}, // 3 - fletch
+ {8,7}, // 4 - hourglass
+ {4,0}, // 5 - TTHand
+ {8,5}, // 6 - Mark's crosshairs
+ {8,7}, // 7 - I-beam
+ {0,0} // 8 - question mark
};
GraphicManager::GraphicManager(AvalancheEngine *vm) {
@@ -127,7 +127,6 @@ void GraphicManager::loadMouse(byte which) {
cursor.create(16, 32, Graphics::PixelFormat::createFormatCLUT8());
cursor.fillRect(Common::Rect(0, 0, 16, 32), 255);
-
// The AND mask.
f.seek(kMouseSize * 2 * which + 134);
diff --git a/engines/avalanche/parser.cpp b/engines/avalanche/parser.cpp
index cca79ff0b4..852a063a7e 100644
--- a/engines/avalanche/parser.cpp
+++ b/engines/avalanche/parser.cpp
@@ -749,8 +749,6 @@ void Parser::storeInterrogation(byte interrogation) {
_vm->_timer->cardiffSurvey();
}
-
-
void Parser::parse() {
// First parsing - word identification
if (!_thats.empty())
@@ -763,7 +761,6 @@ void Parser::parse() {
_person = kPeoplePardon;
clearWords();
-
// A cheat mode attempt.
if (_inputText[0] == '.') {
cheatParse(_inputText);
@@ -1669,7 +1666,6 @@ void Parser::doThat() {
// "Slip" object
_thing -= 49;
-
if ((_verb != kVerbCodeLoad) && (_verb != kVerbCodeSave) && (_verb != kVerbCodeQuit) && (_verb != kVerbCodeInfo) && (_verb != kVerbCodeHelp)
&& (_verb != kVerbCodeLarrypass) && (_verb != kVerbCodePhaon) && (_verb != kVerbCodeBoss) && (_verb != kVerbCodeCheat) && (_verb != kVerbCodeRestart)
&& (_verb != kVerbCodeDir) && (_verb != kVerbCodeScore) && (_verb != kVerbCodeHiscores) && (_verb != kVerbCodeSmartAlec)) {
diff --git a/engines/avalanche/parser.h b/engines/avalanche/parser.h
index bdb5ab9bc1..dfbe2dccb1 100644
--- a/engines/avalanche/parser.h
+++ b/engines/avalanche/parser.h
@@ -34,7 +34,6 @@
#include "common/str.h"
#include "common/serializer.h"
-
namespace Avalanche {
class AvalancheEngine;