X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FFrame.cpp;h=a152ee76c8efa152825dc514938e100df97c3736;hb=908e0b6a2a9c3266da902eccd668f54ee0b94895;hp=1c51c454cad056f9a56f9734e0f490426e2860d4;hpb=0542849dfccfec1ce1477265fa0fee2401a8fb23;p=l2e.git

diff --git a/src/graphics/Frame.cpp b/src/graphics/Frame.cpp
index 1c51c45..a152ee7 100644
--- a/src/graphics/Frame.cpp
+++ b/src/graphics/Frame.cpp
@@ -15,83 +15,83 @@ namespace graphics {
 void Frame::Draw(SDL_Surface *dest, const Vector<int> &position, int width, int height) const {
 	// top-left corner
 	SDL_Rect srcRect;
-	srcRect.x = xOffset;
-	srcRect.y = yOffset;
-	srcRect.w = borderWidth;
-	srcRect.h = borderHeight;
+	srcRect.x = offset.X();
+	srcRect.y = offset.Y();
+	srcRect.w = BorderWidth();
+	srcRect.h = BorderHeight();
 	SDL_Rect destRect;
 	destRect.x = position.X();
 	destRect.y = position.Y();
 	SDL_BlitSurface(surface, &srcRect, dest, &destRect);
 
 	// top border
-	srcRect.x += borderWidth;
-	srcRect.w = repeatWidth;
-	destRect.x += borderWidth;
-	int fullRepeatWidth(width - (2 * borderWidth));
+	srcRect.x += BorderWidth();
+	srcRect.w = RepeatWidth();
+	destRect.x += BorderWidth();
+	int fullRepeatWidth(width - (2 * BorderWidth()));
 	int repeatCursor(0);
 	while (repeatCursor < fullRepeatWidth) {
 		SDL_BlitSurface(surface, &srcRect, dest, &destRect);
-		destRect.x += repeatWidth;
-		repeatCursor += repeatWidth;
+		destRect.x += RepeatWidth();
+		repeatCursor += RepeatWidth();
 	}
 
 	// top-right corner
-	srcRect.x += repeatWidth;
-	srcRect.w = borderWidth;
+	srcRect.x += RepeatWidth();
+	srcRect.w = BorderWidth();
 	SDL_BlitSurface(surface, &srcRect, dest, &destRect);
 
 	// middle
-	destRect.y += borderHeight;
-	int fullRepeatHeight(height - (2 * borderHeight));
+	destRect.y += BorderHeight();
+	int fullRepeatHeight(height - (2 * BorderHeight()));
 	int hRepeatCursor(0);
 	while (hRepeatCursor < fullRepeatHeight) {
 
 		// left border
-		srcRect.x = xOffset;
-		srcRect.y = yOffset + borderHeight;
-		srcRect.w = borderWidth;
-		srcRect.h = repeatHeight;
+		srcRect.x = offset.X();
+		srcRect.y = offset.Y() + BorderHeight();
+		srcRect.w = BorderWidth();
+		srcRect.h = RepeatHeight();
 		destRect.x = position.X();
 		SDL_BlitSurface(surface, &srcRect, dest, &destRect);
 
 		// fill
 		repeatCursor = 0;
-		srcRect.x += borderWidth;
-		srcRect.w = repeatWidth;
-		destRect.x += borderWidth;
+		srcRect.x += BorderWidth();
+		srcRect.w = RepeatWidth();
+		destRect.x += BorderWidth();
 		while (repeatCursor < fullRepeatWidth) {
 			SDL_BlitSurface(surface, &srcRect, dest, &destRect);
-			destRect.x += repeatWidth;
-			repeatCursor += repeatWidth;
+			destRect.x += RepeatWidth();
+			repeatCursor += RepeatWidth();
 		}
 
 		// right border
-		srcRect.x += repeatWidth;
-		srcRect.w = borderWidth;
+		srcRect.x += RepeatWidth();
+		srcRect.w = BorderWidth();
 		SDL_BlitSurface(surface, &srcRect, dest, &destRect);
 
-		destRect.y += repeatHeight;
-		hRepeatCursor += repeatHeight;
+		destRect.y += RepeatHeight();
+		hRepeatCursor += RepeatHeight();
 	}
 
 	// bottom-left corner
-	srcRect.x = xOffset;
-	srcRect.y = yOffset + borderHeight + repeatHeight;
-	srcRect.w = borderWidth;
-	srcRect.h = borderHeight;
+	srcRect.x = offset.X();
+	srcRect.y = offset.Y() + BorderHeight() + RepeatHeight();
+	srcRect.w = BorderWidth();
+	srcRect.h = BorderHeight();
 	destRect.x = position.X();
 	SDL_BlitSurface(surface, &srcRect, dest, &destRect);
 
 	// bottom border
-	srcRect.x += borderWidth;
-	srcRect.w = repeatWidth;
-	destRect.x += borderWidth;
+	srcRect.x += BorderWidth();
+	srcRect.w = RepeatWidth();
+	destRect.x += BorderWidth();
 	repeatCursor = 0;
 	while (repeatCursor < fullRepeatWidth) {
 		SDL_BlitSurface(surface, &srcRect, dest, &destRect);
-		destRect.x += repeatWidth;
-		repeatCursor += repeatWidth;
+		destRect.x += RepeatWidth();
+		repeatCursor += RepeatWidth();
 	}
 	if (fullRepeatWidth < fullRepeatWidth) {
 		srcRect.w = fullRepeatWidth - fullRepeatWidth;
@@ -100,8 +100,8 @@ void Frame::Draw(SDL_Surface *dest, const Vector<int> &position, int width, int
 	}
 
 	// bottom-right corner
-	srcRect.x += repeatWidth;
-	srcRect.w = borderWidth;
+	srcRect.x += RepeatWidth();
+	srcRect.w = BorderWidth();
 	SDL_BlitSurface(surface, &srcRect, dest, &destRect);
 }