diff options
-rw-r--r-- | engines/avalanche/ghostroom.cpp | 16 | ||||
-rw-r--r-- | engines/avalanche/graphics.cpp | 14 | ||||
-rw-r--r-- | engines/avalanche/graphics.h | 4 | ||||
-rw-r--r-- | engines/avalanche/help.cpp | 10 |
4 files changed, 22 insertions, 22 deletions
diff --git a/engines/avalanche/ghostroom.cpp b/engines/avalanche/ghostroom.cpp index b67df878ee..6bd0da7834 100644 --- a/engines/avalanche/ghostroom.cpp +++ b/engines/avalanche/ghostroom.cpp @@ -239,7 +239,7 @@ void GhostRoom::run() { _vm->_graphics->ghostDrawPicture(_eyes[0], x, 135); _vm->_graphics->drawDot(x + 16, 136, kColorBlack); // Eyes would leave a trail 1 pixel high behind them. } - + // Plot the Glerk: if ((x % 10) == 0) { if (_glerkStage > 25) @@ -255,12 +255,12 @@ void GhostRoom::run() { wait(15); } - + // Blank out the Glerk's space. _vm->_graphics->drawFilledRectangle(Common::Rect(456, 14, 530, 50), kColorBlack); _vm->_graphics->refreshScreen(); - + // Here comes the descending ghost: for (int y = -64; y <= 103; y++) { _vm->_graphics->ghostDrawGhost(_ghost[1 + (abs(y / 7) % 2) * 3], 0, y); @@ -298,7 +298,7 @@ void GhostRoom::run() { wait(777); // Erase "aargh": - _vm->_graphics->drawFilledRectangle(Common::Rect(172, 78, 348, 112), kColorBlack); + _vm->_graphics->drawFilledRectangle(Common::Rect(172, 78, 348, 112), kColorBlack); _vm->_graphics->refreshScreen(); for (int i = 4; i >= 0; i--) { @@ -307,14 +307,14 @@ void GhostRoom::run() { } // Erase the exclamation mark: - _vm->_graphics->drawFilledRectangle(Common::Rect(246, 127, 252, 134), kColorBlack); + _vm->_graphics->drawFilledRectangle(Common::Rect(246, 127, 252, 134), kColorBlack); _vm->_graphics->refreshScreen(); // Avvy hurries back: _glerkStage = 0; _greldetCount = 18; _redGreldet = false; - + for (int x = 217; x <= 479; x++) { // The floating eyeballs again: int xBound = x % 30; @@ -343,7 +343,7 @@ void GhostRoom::run() { _greldetCount = 0; _redGreldet = !_redGreldet; } - + _vm->_graphics->ghostDrawPicture(_greldet[kGreldetFade[_greldetCount]][_redGreldet], _greldetX, _greldetY); _greldetCount++; @@ -353,7 +353,7 @@ void GhostRoom::run() { } CursorMan.showMouse(true); - + _vm->fadeOut(); _vm->_graphics->restoreScreen(); _vm->_graphics->removeBackup(); diff --git a/engines/avalanche/graphics.cpp b/engines/avalanche/graphics.cpp index 672a61d8a2..ab1a108194 100644 --- a/engines/avalanche/graphics.cpp +++ b/engines/avalanche/graphics.cpp @@ -363,8 +363,8 @@ void GraphicManager::drawBigText(const Common::String text, FontType font, byte for (int bit = 0; bit < 16; bit++) { if ((bit % 2) == 0) pixelBit = (pixel >> (bit / 2)) & 1; - for (int k = 0; k < 2; k++) - if (pixelBit) + for (int k = 0; k < 2; k++) + if (pixelBit) *(byte *)_surface.getBasePtr(x + i * 16 + 16 - bit, y + j * 2 + k) = color; } } @@ -552,7 +552,7 @@ void GraphicManager::ghostDrawGhost(byte ghostArr[2][66][26], uint16 destX, int1 } } } - + drawPicture(_surface, ghostPic, destX, destY); ghostPic.free(); @@ -592,11 +592,11 @@ Graphics::Surface GraphicManager::ghostLoadPicture(Common::File &file, Common::P coord.x = cb._x; coord.y = cb._y; - + Graphics::Surface picture = loadPictureGraphic(file); skipDifference(cb._size, picture, file); - + return picture; } @@ -728,7 +728,7 @@ void GraphicManager::seuLoad() { if (!file.open("notts.avd")) error("AVALANCHE: ShootEmUp: File not found: notts.avd"); - + for (int i = 0; i < 99; i++) { int size = file.readUint16LE(); _seuPictures[i] = loadPictureGraphic(file); @@ -778,7 +778,7 @@ Graphics::Surface GraphicManager::loadPictureGraphic(Common::File &file) { Graphics::Surface picture; // We make a Surface object for the picture itself. picture.create(width, height, Graphics::PixelFormat::createFormatCLUT8()); - + // Produce the picture. We read it in row-by-row, and every row has 4 planes. for (int y = 0; y < height; y++) { for (int8 plane = 3; plane >= 0; plane--) { // The planes are in the opposite way. diff --git a/engines/avalanche/graphics.h b/engines/avalanche/graphics.h index 73e2899226..e5538bca7a 100644 --- a/engines/avalanche/graphics.h +++ b/engines/avalanche/graphics.h @@ -162,7 +162,7 @@ private: Graphics::Surface _surface; // For the mini-game "Nim". - Graphics::Surface _nimStone; + Graphics::Surface _nimStone; Graphics::Surface _nimInitials[3]; Graphics::Surface _nimLogo; @@ -178,7 +178,7 @@ private: // Further information about these two: http://www.shikadi.net/moddingwiki/Raw_EGA_data Graphics::Surface loadPictureGraphic(Common::File &file); // Reads Graphic-planar EGA data. Graphics::Surface loadPictureSign(Common::File &file, int xl, int yl); // Reads a tricky type of picture used for the "game over"/"about" scrolls and in the mini-game Nim. - + void drawText(Graphics::Surface &surface, const Common::String text, FontType font, byte fontHeight, int16 x, int16 y, Color color); void drawPicture(Graphics::Surface &target, const Graphics::Surface picture, uint16 destX, uint16 destY); diff --git a/engines/avalanche/help.cpp b/engines/avalanche/help.cpp index 0d4eff9c23..0e60f5fadb 100644 --- a/engines/avalanche/help.cpp +++ b/engines/avalanche/help.cpp @@ -52,7 +52,7 @@ Help::Help(AvalancheEngine *vm) { */ void Help::switchPage(byte which) { // Help icons are 80x20. - + _highlightWas = 177; // Forget where the highlight was. Common::File file; @@ -78,7 +78,7 @@ void Help::switchPage(byte which) { _vm->_graphics->drawBigText("help!", _vm->_font, 8, 549, 1, kColorBlack); _vm->_graphics->drawBigText("help!", _vm->_font, 8, 550, 0, kColorCyan); - + byte y = 0; do { Common::String line = getLine(file); @@ -143,7 +143,7 @@ void Help::switchPage(byte which) { _vm->_graphics->drawBigText(text, _vm->_font, 8, 589 - (text.size() * 8), 18 + (y + 1) * 27, kColorBlack); _vm->_graphics->drawBigText(text, _vm->_font, 8, 590 - (text.size() * 8), 17 + (y + 1) * 27, kColorCyan); - + y++; _buttonNum++; } @@ -175,7 +175,7 @@ bool Help::handleMouse(const Common::Event &event) { if ((mousePos.x < 470) || (mousePos.x > 550) || (((mousePos.y - 13) % 27) > 20)) index = -1; - else // Clicked on a button. + else // Clicked on a button. index = ((mousePos.y - 13) / 27) - 1; } else { // LBUTTONDOWN or MOUSEMOVE int highlightIs = 0; @@ -244,7 +244,7 @@ void Help::run() { _vm->fadeIn(); _vm->_graphics->loadMouse(kCurHelp); - + // Originally it was the body of 'continue_help': bool close = false; while (!_vm->shouldQuit() && !close) { |