From 759e499626013a92917ea6bb3f9190486ae41c1d Mon Sep 17 00:00:00 2001 From: uruk Date: Sat, 12 Apr 2014 19:51:10 +0200 Subject: AVALANCHE: Remove unnecessary TODOs. --- engines/avalanche/avalanche.cpp | 4 ++-- engines/avalanche/dropdown.cpp | 2 +- engines/avalanche/graphics.h | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp index 5b41414c2c..15b43b3883 100644 --- a/engines/avalanche/avalanche.cpp +++ b/engines/avalanche/avalanche.cpp @@ -336,7 +336,7 @@ void AvalancheEngine::synchronize(Common::Serializer &sz) { } -bool AvalancheEngine::canSaveGameStateCurrently() { // TODO: Refine these!!! +bool AvalancheEngine::canSaveGameStateCurrently() { return (_animationsEnabled && _alive); } @@ -381,7 +381,7 @@ Common::String AvalancheEngine::getSaveFileName(const int slot) { return Common::String::format("%s.%03d", _targetName.c_str(), slot); } -bool AvalancheEngine::canLoadGameStateCurrently() { // TODO: Refine these!!! +bool AvalancheEngine::canLoadGameStateCurrently() { return (_animationsEnabled); } diff --git a/engines/avalanche/dropdown.cpp b/engines/avalanche/dropdown.cpp index 7c0529811e..97adfc2581 100644 --- a/engines/avalanche/dropdown.cpp +++ b/engines/avalanche/dropdown.cpp @@ -678,7 +678,7 @@ void DropDownMenu::setup() { _menuBar.draw(); } -void DropDownMenu::update() { // TODO: Optimize it ASAP!!! It really needs it... +void DropDownMenu::update() { _vm->_graphics->saveScreen(); Common::Point cursorPos = _vm->getMousePos(); diff --git a/engines/avalanche/graphics.h b/engines/avalanche/graphics.h index 7e0ed64b5f..3fd633f0ab 100644 --- a/engines/avalanche/graphics.h +++ b/engines/avalanche/graphics.h @@ -97,7 +97,7 @@ public: void drawWinningPic(); // Ghostroom's functions: - void ghostDrawGhost(byte ghostArr[2][66][26], uint16 destX, int16 destY); // Very similar to loadPictureSign(). TODO: Unify the two later if possible. + void ghostDrawGhost(byte ghostArr[2][66][26], uint16 destX, int16 destY); void ghostDrawGlerk(byte glerkArr[4][35][9], uint16 destX, uint16 destY); // Very similar to ghostDrawGhost(), but not enough to unify the two. Graphics::Surface ghostLoadPicture(Common::File &file, Common::Point &coord); void ghostDrawPicture(const Graphics::Surface &picture, uint16 destX, uint16 destY); @@ -106,7 +106,7 @@ public: // Help's function: void helpDrawButton(int y, byte which); void helpDrawHighlight(byte which, Color color); - void helpDrawBigText(const Common::String text, int16 x, int16 y, Color color); // Very similar to drawText. TODO: Try to unify the two. + void helpDrawBigText(const Common::String text, int16 x, int16 y, Color color); // Shoot em' up's functions: void seuDrawTitle(); @@ -199,12 +199,11 @@ private: Graphics::Surface loadPictureSign(Common::File &file, uint16 width, uint16 height); // 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 drawBigText(Graphics::Surface &surface, const Common::String text, FontType font, byte fontHeight, int16 x, int16 y, Color color); // Very similar to drawText. TODO: Try to unify the two. + void drawBigText(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); // Taken from Free Pascal's Procedure InternalEllipseDefault. Used to replace Pascal's procedure arc. // Returns the end point of the arc. (Needed in Clock.) - // TODO: Make it more accurate later. Common::Point drawArc(Graphics::Surface &surface, int16 x, int16 y, int16 stAngle, int16 endAngle, uint16 radius, Color color); }; -- cgit v1.2.3