From 081ba3a59996c203d9e8bd33f68d9de1292970e2 Mon Sep 17 00:00:00 2001
From: Matt Mullins <mokomull@gmail.com>
Date: Sat, 11 Jul 2009 17:40:49 -0500
Subject: [PATCH] Cleanup on Sprite; we're not done, but it's unbroken

---
 Sprite.cpp | 16 ++++++++++------
 Sprite.h   | 13 +------------
 main.cpp   | 12 +++---------
 3 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/Sprite.cpp b/Sprite.cpp
index 226757f..a035574 100644
--- a/Sprite.cpp
+++ b/Sprite.cpp
@@ -3,17 +3,21 @@
 using std::cout;
 using std::endl;
 
-int Sprite::init(SDL_Surface *screen, Animation *anim, ...)
+Sprite::Sprite(SDL_Surface *screen, std::string name, Animation *anim) :
+	mFrame(0),
+	mDrawn(0),
+	mVisible(true),
+	mLastUpdate(0),
+	mSpriteAnimation(anim),
+	mScreen(screen)
 {
-	mSpriteAnimation = anim;
+	//later add a part that adds name to list of level sprites
+	//Game.Level.SpriteList.pushback(name);
 	if(mSpriteAnimation -> mBuilt)
 	{
-		if(mSpriteAnimation->mNumFrames>1) mAnimating =1;
+		if (mSpriteAnimation->mNumFrames > 1) mAnimating = 1;
 		mBackReplacement = SDL_DisplayFormat(mSpriteAnimation->mAnim[0].image);
 	}
-	mVisible=true;
-	mAnimating=true;
-	mScreen = screen;
 }
 
 void Sprite::clearBG()
diff --git a/Sprite.h b/Sprite.h
index 9c0be7c..b187f7f 100644
--- a/Sprite.h
+++ b/Sprite.h
@@ -6,18 +6,7 @@
 class Sprite
 {
 	public:
-	Sprite():mFrame(0),mLastUpdate(0),mDrawn(0) {}
-	Sprite(std::string name,Animation *anim, SDL_Surface *screen):mSpriteAnimation(anim),mScreen(screen),mFrame(0),mLastUpdate(0),mDrawn(0)
-	{
-		//later add a part that adds name to list of level sprites
-		//Game.Level.SpriteList.pushback(name);
-		if(mSpriteAnimation -> mBuilt)
-		{
-			if(mSpriteAnimation->mNumFrames>1) mAnimating =1;
-			mBackReplacement = SDL_DisplayFormat(mSpriteAnimation->mAnim[0].image);
-		}
-	}
-	int init(SDL_Surface *screen, Animation *anim, ...);
+	Sprite(SDL_Surface *screen, std::string name, Animation *anim);
 	void draw();
 	void clearBG();
 	void updateBG();
diff --git a/main.cpp b/main.cpp
index b0d23f7..111a75c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -289,21 +289,15 @@ int main (int argc, char *argv[])
 	//Animation sunAnimation = new Animation();
 	sunAnimation.loadAnimation("sun.anim");
 	
-	Sprite vikings1;
-	vikings1.name="viking1";
-	vikings1.init(screen, &vikingAnimation);
+	Sprite vikings1(screen, "viking1", &vikingAnimation);
 	vikings1.setPosition(10,30);
 	vikings1.setSpeed(1);
 
-	Sprite vikings2;
-	vikings2.name="viking2";
-	vikings2.init(screen, &vikingAnimation);
+	Sprite vikings2(screen, "viking2", &vikingAnimation);
 	vikings2.setPosition(350,300);
 	vikings2.setSpeed(1.5);
 
-	Sprite sun;
-	sun.name="sun";
-	sun.init(screen, &sunAnimation);
+	Sprite sun(screen, "sun", &sunAnimation);
 	sun.setPosition(480,50);
 	sun.setSpeed(1);
 	
-- 
2.11.0