thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AVALANCHE: Janitorial - Remove extra blank lines

Browse source
This commit is contained in:
Strangerke 2013-11-22 21:40:16 +01:00
parent 93e5d415c6
commit 11c15bea00
7 changed files with 8 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
engines/avalanche/avalot.cpp
View file

@ -199,7 +199,6 @@ void Clock::chime() {
} }
} }
void AvalancheEngine::handleKeyDown(Common::Event &event) { void AvalancheEngine::handleKeyDown(Common::Event &event) {
_sound->click(); _sound->click();
@ -576,7 +575,6 @@ void AvalancheEngine::exitRoom(byte x) {
_lastRoomNotMap = _room; _lastRoomNotMap = _room;
} }
/** /**
* Only when entering a NEW town! Not returning to the last one, * Only when entering a NEW town! Not returning to the last one,
* but choosing another from the map. * but choosing another from the map.
@ -1341,7 +1339,6 @@ void AvalancheEngine::drawDirection() { // It's data is loaded in load_digits().
CursorMan.showMouse(true); CursorMan.showMouse(true);
} }
void AvalancheEngine::gameOver() { void AvalancheEngine::gameOver() {
_userMovesAvvy = false; _userMovesAvvy = false;

1
engines/avalanche/console.cpp
View file

@ -50,5 +50,4 @@ bool AvalancheConsole::Cmd_MagicLines(int argc, const char **argv) {
return false; return false;
} }
} // End of namespace Avalanche } // End of namespace Avalanche

1
engines/avalanche/dialogs.cpp
View file

@ -190,7 +190,6 @@ void Dialogs::scrollModeNormal() {
break; break;
} while (!((mrelease > 0) || (buttona1()) || (buttonb1()))); } while (!((mrelease > 0) || (buttona1()) || (buttonb1())));
if (mrelease == 0) { if (mrelease == 0) {
inkey(); inkey();
if (aboutscroll) { if (aboutscroll) {

1
engines/avalanche/enums.h
View file

@ -127,7 +127,6 @@ static const int16 kScreenHeight = 200;
static const int16 kWalk = 3; static const int16 kWalk = 3;
static const int16 kRun = 5; static const int16 kRun = 5;
} // End of namespace Avalanche } // End of namespace Avalanche
#endif // AVALANCHE_ENUMS_H #endif // AVALANCHE_ENUMS_H

17
engines/avalanche/graphics.cpp
View file

@ -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 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] = { const MouseHotspotType GraphicManager::kMouseHotSpots[9] = {
{8,0}, // 0 - up-arrow {8,0}, // 0 - up-arrow
{0,0}, // 1 - screwdriver {0,0}, // 1 - screwdriver
{15,6}, // 2 - right-arrow {15,6}, // 2 - right-arrow
{0,0}, // 3 - fletch {0,0}, // 3 - fletch
{8,7}, // 4 - hourglass {8,7}, // 4 - hourglass
{4,0}, // 5 - TTHand {4,0}, // 5 - TTHand
{8,5}, // 6 - Mark's crosshairs {8,5}, // 6 - Mark's crosshairs
{8,7}, // 7 - I-beam {8,7}, // 7 - I-beam
{0,0} // 8 - question mark {0,0} // 8 - question mark
}; };
GraphicManager::GraphicManager(AvalancheEngine *vm) { GraphicManager::GraphicManager(AvalancheEngine *vm) {
@ -127,7 +127,6 @@ void GraphicManager::loadMouse(byte which) {
cursor.create(16, 32, Graphics::PixelFormat::createFormatCLUT8()); cursor.create(16, 32, Graphics::PixelFormat::createFormatCLUT8());
cursor.fillRect(Common::Rect(0, 0, 16, 32), 255); cursor.fillRect(Common::Rect(0, 0, 16, 32), 255);
// The AND mask. // The AND mask.
f.seek(kMouseSize * 2 * which + 134); f.seek(kMouseSize * 2 * which + 134);

4
engines/avalanche/parser.cpp
View file

@ -749,8 +749,6 @@ void Parser::storeInterrogation(byte interrogation) {
_vm->_timer->cardiffSurvey(); _vm->_timer->cardiffSurvey();
} }
void Parser::parse() { void Parser::parse() {
// First parsing - word identification // First parsing - word identification
if (!_thats.empty()) if (!_thats.empty())
@ -763,7 +761,6 @@ void Parser::parse() {
_person = kPeoplePardon; _person = kPeoplePardon;
clearWords(); clearWords();
// A cheat mode attempt. // A cheat mode attempt.
if (_inputText[0] == '.') { if (_inputText[0] == '.') {
cheatParse(_inputText); cheatParse(_inputText);
@ -1669,7 +1666,6 @@ void Parser::doThat() {
// "Slip" object // "Slip" object
_thing -= 49; _thing -= 49;
if ((_verb != kVerbCodeLoad) && (_verb != kVerbCodeSave) && (_verb != kVerbCodeQuit) && (_verb != kVerbCodeInfo) && (_verb != kVerbCodeHelp) if ((_verb != kVerbCodeLoad) && (_verb != kVerbCodeSave) && (_verb != kVerbCodeQuit) && (_verb != kVerbCodeInfo) && (_verb != kVerbCodeHelp)
&& (_verb != kVerbCodeLarrypass) && (_verb != kVerbCodePhaon) && (_verb != kVerbCodeBoss) && (_verb != kVerbCodeCheat) && (_verb != kVerbCodeRestart) && (_verb != kVerbCodeLarrypass) && (_verb != kVerbCodePhaon) && (_verb != kVerbCodeBoss) && (_verb != kVerbCodeCheat) && (_verb != kVerbCodeRestart)
&& (_verb != kVerbCodeDir) && (_verb != kVerbCodeScore) && (_verb != kVerbCodeHiscores) && (_verb != kVerbCodeSmartAlec)) { && (_verb != kVerbCodeDir) && (_verb != kVerbCodeScore) && (_verb != kVerbCodeHiscores) && (_verb != kVerbCodeSmartAlec)) {

1
engines/avalanche/parser.h
View file

@ -34,7 +34,6 @@
#include "common/str.h" #include "common/str.h"
#include "common/serializer.h" #include "common/serializer.h"
namespace Avalanche { namespace Avalanche {
class AvalancheEngine; class AvalancheEngine;