X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FSprite.cpp;h=28d3b5c215c33a0459ad0963fe3f6393a0d3f9cb;hb=46d158b25b842d2ec4b9734af09ca6006c934498;hp=5b974bd3817ed3ed97b89c1879fc0595ec80b78f;hpb=4083783e857cd6f039af2faaef43a30788948a6b;p=l2e.git

diff --git a/src/graphics/Sprite.cpp b/src/graphics/Sprite.cpp
index 5b974bd..28d3b5c 100644
--- a/src/graphics/Sprite.cpp
+++ b/src/graphics/Sprite.cpp
@@ -7,23 +7,27 @@
 
 #include "Sprite.h"
 
-using geometry::Point;
+#include "../loader/TypeDescription.h"
+
+using geometry::Vector;
+using loader::FieldDescription;
+using loader::TypeDescription;
 
 namespace graphics {
 
-void Sprite::Draw(SDL_Surface *dest, Point<int> position, int col, int row) const {
+void Sprite::Draw(SDL_Surface *dest, const Vector<int> &position, int col, int row) const {
 	SDL_Rect srcRect, destRect;
-	srcRect.x = col * Width();
-	srcRect.y = row * Height();
+	srcRect.x = offset.X() + col * Width();
+	srcRect.y = offset.Y() + row * Height();
 	srcRect.w = Width();
 	srcRect.h = Height();
 	destRect.x = position.X();
 	destRect.y = position.Y();
-	destRect.w = Width();
-	destRect.h = Height();
 	if (surface) {
 		SDL_BlitSurface(surface, &srcRect, dest, &destRect);
 	} else {
+		destRect.w = Width();
+		destRect.h = Height();
 		bool red(true);
 		while (destRect.w > 1 && destRect.h > 1) {
 			SDL_FillRect(dest, &destRect, SDL_MapRGB(dest->format, red ? 0xFF : 0, 0, 0));
@@ -36,4 +40,19 @@ void Sprite::Draw(SDL_Surface *dest, Point<int> position, int col, int row) cons
 	}
 }
 
+
+void Sprite::CreateTypeDescription() {
+	Sprite s;
+
+	int imageId(TypeDescription::GetTypeId("Image"));
+	int vectorId(TypeDescription::GetTypeId("Vector"));
+
+	TypeDescription &td(TypeDescription::CreateOrGet("Sprite"));
+	td.SetSize(sizeof(Sprite));
+
+	td.AddField("image", FieldDescription(((char *)&s.surface) - ((char *)&s), imageId, true));
+	td.AddField("size", FieldDescription(((char *)&s.size) - ((char *)&s), vectorId, false));
+	td.AddField("offset", FieldDescription(((char *)&s.offset) - ((char *)&s), vectorId, false));
+}
+
 }