[Scummvm-cvs-logs] scummvm master -> dbfe4972e3a3e1d59aee8993697028cdd2de8da2

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
dbfe4972e3 MADS: Remove deprecated code from AnimationView and a bunch of out-of-date TODOs


Commit: dbfe4972e3a3e1d59aee8993697028cdd2de8da2
    https://github.com/scummvm/scummvm/commit/dbfe4972e3a3e1d59aee8993697028cdd2de8da2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-10-18T11:55:30-04:00

Commit Message:
MADS: Remove deprecated code from AnimationView and a bunch of out-of-date TODOs

Changed paths:
    engines/mads/animation.cpp
    engines/mads/game.cpp
    engines/mads/menu_views.cpp
    engines/mads/menu_views.h
    engines/mads/msurface.cpp
    engines/mads/nebular/game_nebular.h



diff --git a/engines/mads/animation.cpp b/engines/mads/animation.cpp
index 9f0e0ad..2b999fa 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 b544eff..63a7e40 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 1314774..03afc70 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 c13213c..cc5a130 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 0cb4530..39824ba 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 da607d4..efa21a2 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;