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

AVALANCHE: Janitorial - Use ++ and -- when possible

Browse source
This commit is contained in:
Strangerke 2013-09-25 23:57:08 +02:00
parent 6cd9bd141c
commit 90c6e6a689
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/avalanche/animation.cpp
View file

@ -848,7 +848,7 @@ void Animation::callSpecial(uint16 which) {
break; break;
case 12: // _vm->_avalot->special 12: transfer south in catacombs. case 12: // _vm->_avalot->special 12: transfer south in catacombs.
_vm->_avalot->dusk(); _vm->_avalot->dusk();
_vm->_avalot->_catacombY += 1; _vm->_avalot->_catacombY++;
catacombMove(2); catacombMove(2);
if (_vm->_avalot->_room != kRoomCatacombs) if (_vm->_avalot->_room != kRoomCatacombs)
return; return;
@ -924,13 +924,13 @@ void Animation::followAvalotY(byte tripnum) {
_sprites[tripnum]._homingY = _sprites[1]._y; _sprites[tripnum]._homingY = _sprites[1]._y;
else { else {
if (_sprites[tripnum]._y < _sprites[1]._y) if (_sprites[tripnum]._y < _sprites[1]._y)
_sprites[tripnum]._y += 1; _sprites[tripnum]._y++;
else if (_sprites[tripnum]._y > _sprites[1]._y) else if (_sprites[tripnum]._y > _sprites[1]._y)
_sprites[tripnum]._y -= 1; _sprites[tripnum]._y--;
else else
return; return;
if (_sprites[tripnum]._moveX == 0) { if (_sprites[tripnum]._moveX == 0) {
_sprites[tripnum]._stepNum += 1; _sprites[tripnum]._stepNum++;
if (_sprites[tripnum]._stepNum == _sprites[tripnum]._stat._seq) if (_sprites[tripnum]._stepNum == _sprites[tripnum]._stat._seq)
_sprites[tripnum]._stepNum = 0; _sprites[tripnum]._stepNum = 0;
_sprites[tripnum]._count = 0; _sprites[tripnum]._count = 0;

2
engines/avalanche/background.cpp
View file

@ -73,7 +73,7 @@ void Background::update() {
case kRoomArgentPub: case kRoomArgentPub:
if (((_vm->_avalot->_roomTime % 7) == 1) && (_vm->_avalot->_malagauche != 177)) { if (((_vm->_avalot->_roomTime % 7) == 1) && (_vm->_avalot->_malagauche != 177)) {
// Malagauche cycle. // Malagauche cycle.
_vm->_avalot->_malagauche += 1; _vm->_avalot->_malagauche++;
switch (_vm->_avalot->_malagauche) { switch (_vm->_avalot->_malagauche) {
case 1: case 1:
case 11: case 11:

4
engines/avalanche/dialogs.cpp
View file

@ -145,7 +145,7 @@ void Dialogs::scrollModeNormal() {
do { do {
_vm->_avalot->check(); // was "checkclick;" _vm->_avalot->check(); // was "checkclick;"
//#ifdef RECORD slowdown(); basher::count += 1; #endif //#ifdef RECORD slowdown(); basher::count++; #endif
if (_vm->_enhanced->keypressede()) if (_vm->_enhanced->keypressede())
break; break;
@ -192,7 +192,7 @@ bool Dialogs::theyMatch(TuneType &played) {
for (unsigned int i = 0; i < sizeof(played); i++) { for (unsigned int i = 0; i < sizeof(played); i++) {
if (played[i] != _vm->_avalot->kTune[i]) if (played[i] != _vm->_avalot->kTune[i])
mistakes += 1; mistakes++;
} }
return mistakes < 5; return mistakes < 5;

2
engines/avalanche/parser.cpp
View file

@ -1386,7 +1386,7 @@ bool Parser::giveToSpludwick() {
} }
void Parser::drink() { void Parser::drink() {
_alcoholLevel += 1; _alcoholLevel++;
if (_alcoholLevel == 5) { if (_alcoholLevel == 5) {
_vm->_avalot->_objects[kObjectKey - 1] = true; // Get the key. _vm->_avalot->_objects[kObjectKey - 1] = true; // Get the key.
_vm->_avalot->_teetotal = true; _vm->_avalot->_teetotal = true;