Wrote CompositeImage, added it to BaseBarrier

2016-04-05 23:40:31 +10:00
parent 8749d1fd93
commit d3f855c69b
3 changed files with 161 additions and 3 deletions
@@ -23,10 +23,13 @@

 #include "entity.hpp"

+#include "composite_image.hpp"
+
 class BaseBarrier: public Entity {
 public:
-	BaseBarrier() = default;
-	virtual ~BaseBarrier() = default;
+	BaseBarrier() = delete;
+	BaseBarrier(Image baseImage, std::map<std::string, Image>& templateImages);
+	virtual ~BaseBarrier();

 	void CorrectSprite();

@@ -36,8 +39,12 @@ public:
 	int* SetStatusArray(int*);
 	int* GetStatusArray();

+	CompositeImage<>* GetComposite();

 protected:
 	//metadata
 	int status[8];
+
+	Image baseImage;
+	CompositeImage<> composite;
 };