diff options
author | Paul Gilbert | 2014-10-18 11:55:30 -0400 |
---|---|---|
committer | Paul Gilbert | 2014-10-18 11:55:30 -0400 |
commit | dbfe4972e3a3e1d59aee8993697028cdd2de8da2 (patch) | |
tree | 42bb020ce248ec6aa02c1e0227baa0a6ca0337b0 /engines/mads | |
parent | a657c3982447704c9262926f853875ca80e7a7c4 (diff) | |
download | scummvm-rg350-dbfe4972e3a3e1d59aee8993697028cdd2de8da2.tar.gz scummvm-rg350-dbfe4972e3a3e1d59aee8993697028cdd2de8da2.tar.bz2 scummvm-rg350-dbfe4972e3a3e1d59aee8993697028cdd2de8da2.zip |
MADS: Remove deprecated code from AnimationView and a bunch of out-of-date TODOs
Diffstat (limited to 'engines/mads')
-rw-r--r-- | engines/mads/animation.cpp | 3 | ||||
-rw-r--r-- | engines/mads/game.cpp | 2 | ||||
-rw-r--r-- | engines/mads/menu_views.cpp | 36 | ||||
-rw-r--r-- | engines/mads/menu_views.h | 4 | ||||
-rw-r--r-- | engines/mads/msurface.cpp | 4 | ||||
-rw-r--r-- | engines/mads/nebular/game_nebular.h | 4 |
6 files changed, 1 insertions, 52 deletions
diff --git a/engines/mads/animation.cpp b/engines/mads/animation.cpp index 9f0e0adb6d..2b999fa305 100644 --- a/engines/mads/animation.cpp +++ b/engines/mads/animation.cpp @@ -340,9 +340,6 @@ void Animation::startAnimation(int endTrigger) { _unkIndex = -1; //SpriteAsset *asset = _scene->_sprites[_spriteListIndexes[_header._spritesIndex]]; - // TODO: Weird stuff with _unkList. Seems like it's treated as pointers - // here, but in processText, it's used as POINTs? - loadFrame(1); } diff --git a/engines/mads/game.cpp b/engines/mads/game.cpp index b544eff2db..63a7e40d1b 100644 --- a/engines/mads/game.cpp +++ b/engines/mads/game.cpp @@ -433,8 +433,6 @@ void Game::handleKeypress(const Common::Event &event) { default: break; } - - warning("TODO: handleKeypress - %d", (int)event.kbd.keycode); } void Game::synchronize(Common::Serializer &s, bool phase1) { diff --git a/engines/mads/menu_views.cpp b/engines/mads/menu_views.cpp index 1314774371..03afc70c3e 100644 --- a/engines/mads/menu_views.cpp +++ b/engines/mads/menu_views.cpp @@ -765,40 +765,4 @@ int AnimationView::getParameter() { return result; } -void AnimationView::checkResource(const Common::String &resourceName) { - //bool hasSuffix = false; - -} - -int AnimationView::scanResourceIndex(const Common::String &resourceName) { - int foundIndex = -1; - - if (_v1) { - const char *chP = strchr(resourceName.c_str(), '\\'); - if (!chP) { - chP = strchr(resourceName.c_str(), '*'); - } - - Common::String resName = chP ? Common::String(chP + 1) : resourceName; - - if (_v2 != 3) { - assert(_resIndex.size() == 0); - } - - // Scan for the resource name - for (uint resIndex = 0; resIndex < _resIndex.size(); ++resIndex) { - ResIndexEntry &resEntry = _resIndex[resIndex]; - if (resEntry._resourceName.compareToIgnoreCase(resourceName)) { - foundIndex = resIndex; - break; - } - } - } - - if (foundIndex >= 0) { - // TODO - } - return -1; -} - } // End of namespace MADS diff --git a/engines/mads/menu_views.h b/engines/mads/menu_views.h index c13213c3ed..cc5a13006f 100644 --- a/engines/mads/menu_views.h +++ b/engines/mads/menu_views.h @@ -192,10 +192,6 @@ private: int _animFrameNumber; bool _nextCyclingActive; private: - void checkResource(const Common::String &resourceName); - - int scanResourceIndex(const Common::String &resourceName); - void load(); void processLines(); diff --git a/engines/mads/msurface.cpp b/engines/mads/msurface.cpp index 0cb4530a84..39824bac4b 100644 --- a/engines/mads/msurface.cpp +++ b/engines/mads/msurface.cpp @@ -87,7 +87,6 @@ void MSurface::drawSprite(const Common::Point &pt, SpriteInfo &info, const Commo // rectangle is always 0, 0 assert(clipRect.top == 0 && clipRect.left == 0); - // TODO: Put err* and scaled* into SpriteInfo int errX = info.hotX * info.scaleX % 100; int errY = info.hotY * info.scaleY % 100; int scaledWidth = scaleValue(info.width, info.scaleX, errX); @@ -160,7 +159,6 @@ void MSurface::drawSprite(const Common::Point &pt, SpriteInfo &info, const Commo if (status == kStatusDraw && clipY == 0) { // Draw previously scaled line - // TODO Implement different drawing types (depth, shadow etc.) byte *tempDst = dst; for (int lineX = 0; lineX < scaledWidth; lineX++) { byte pixel = scaledLineBuf[lineX]; @@ -186,8 +184,6 @@ void MSurface::drawSprite(const Common::Point &pt, SpriteInfo &info, const Commo } dst += pitch; heightAmt--; - // TODO depth etc. - //depthAddress += Destination -> Width; errY += 100; if (errY >= 0) diff --git a/engines/mads/nebular/game_nebular.h b/engines/mads/nebular/game_nebular.h index da607d47ee..efa21a2e73 100644 --- a/engines/mads/nebular/game_nebular.h +++ b/engines/mads/nebular/game_nebular.h @@ -133,18 +133,16 @@ public: virtual void synchronize(Common::Serializer &s, bool phase1); }; - +// Section handlers aren't needed in ScummVM implementation class Section1Handler : public SectionHandler { public: Section1Handler(MADSEngine *vm) : SectionHandler(vm) {} - // TODO: Properly implement handler methods virtual void preLoadSection() {} virtual void sectionPtr2() {} virtual void postLoadSection() {} }; -// TODO: Properly implement handler classes typedef Section1Handler Section2Handler; typedef Section1Handler Section3Handler; typedef Section1Handler Section4Handler; |