Remove frame-margin #2

animatedsprite.cpp

@@ -12,8 +12,8 @@ namespace Animation
 
 		if(reverse != bounced)
 			frameNumber = frameCount - (frameNumber + 1);
-		unsigned const x = frameOrigin.x + (frameNumber * frameMargin.x) + (frameNumber * frameStep.x);
-		unsigned const y = frameOrigin.y + (frameNumber * frameMargin.y) + (frameNumber * frameStep.y);
+		unsigned const x = frameOrigin.x + (frameNumber * frameStep.x);
+		unsigned const y = frameOrigin.y + (frameNumber * frameStep.y);
 	
 		return sf::IntRect(x, y, frameSize.x, frameSize.y);
 	}
@@ -22,7 +22,6 @@ namespace Animation
 		: frameOrigin(0, 0),
 		frameSize(0, 0),
 		frameStep(0, 0),
-		frameMargin(0, 0),
 		frameCount(0),
 		frameTime(0),
 		reverse(false),
@@ -37,7 +36,6 @@ namespace Animation
 			"frame-origin",
 			"frame-size",
 			"frame-step",
-			"frame-margin",
 			"frame-count",
 			"frame-time",
 			"reverse",
@@ -88,27 +86,22 @@ namespace Animation
 							break;
 
 							case 3:
-							line >> candidate.frameMargin.x;
-							line >> candidate.frameMargin.y;
-							break;
-
-							case 4:
 							line >> candidate.frameCount;
 							break;
 
-							case 5:
+							case 4:
 							line >> candidate.frameTime;
 							break;
 
-							case 6:
+							case 5:
 							candidate.reverse = true;
 							break;
 
-							case 7:
+							case 6:
 							candidate.loop = true;
 							break;
 
-							case 8:
+							case 7:
 							candidate.loop = true;
 							candidate.bounce = true;
 							break;