1 files changed, 29 insertions, 22 deletions

diff --git a/engines/prince/graphics.cpp b/engines/prince/graphics.cpp
index 74b46aad4c..29d3a331df 100644
--- a/engines/prince/graphics.cpp
+++ b/engines/prince/graphics.cpp
@@ -29,46 +29,53 @@
 namespace Prince {
 
 GraphicsMan::GraphicsMan(PrinceEngine *vm) 
-    : _vm(vm), _changed(false) {
-    initGraphics(640, 480, true);
-    _frontScreen = new Graphics::Surface();
-    _frontScreen->create(640, 480, Graphics::PixelFormat::createFormatCLUT8());
+	: _vm(vm), _changed(false) {
+	initGraphics(640, 480, true);
+	_frontScreen = new Graphics::Surface();
+	_frontScreen->create(640, 480, Graphics::PixelFormat::createFormatCLUT8());
 }
 
 void GraphicsMan::update() {
-    if (_changed) {
-        _vm->_system->copyRectToScreen((byte*)_frontScreen->getBasePtr(0,0), 640, 0, 0, 640, 480);
+	if (_changed) {
+		_vm->_system->copyRectToScreen((byte*)_frontScreen->getBasePtr(0,0), 640, 0, 0, 640, 480);
 
-        _vm->_system->updateScreen();
-    }
+		_vm->_system->updateScreen();
+		_changed = false;
+	}
 }
 
 void GraphicsMan::setPalette(const byte *palette) {
-    _vm->_system->getPaletteManager()->setPalette(palette, 0, 256);
+	_vm->_system->getPaletteManager()->setPalette(palette, 0, 256);
 }
 
 void GraphicsMan::change() {
-    _changed = true;
+	_changed = true;
 }
 
-void GraphicsMan::draw(const Graphics::Surface *s)
+void GraphicsMan::draw(uint16 posX, uint16 posY, const Graphics::Surface *s)
 {
-   for (uint y = 0; y < 480; y++)
-       memcpy((byte*)_frontScreen->getBasePtr(0, y), (byte*)s->getBasePtr(0, y), 640);
-   change();
+	uint16 w = MIN(_frontScreen->w, s->w);
+	for (uint y = 0; y < s->h; y++) {
+		if (y < _frontScreen->h) {
+		   memcpy((byte*)_frontScreen->getBasePtr(0, y), (byte*)s->getBasePtr(0, y), w);
+		}
+	}
+	change();
 }
 
 void GraphicsMan::drawTransparent(const Graphics::Surface *s)
 {
-    for (uint y = 0; y < 480; ++y) {
-        for (uint x = 0; x < 640; ++x) {
-            byte pixel = *((byte*)s->getBasePtr(x,y));
-            if (pixel != 255) {
-                *((byte*)_frontScreen->getBasePtr(x, y)) = pixel;
-            }
-        }
-    }
+	for (uint y = 0; y < s->h; ++y) {
+		for (uint x = 0; x < s->w; ++x) {
+			byte pixel = *((byte*)s->getBasePtr(x,y));
+			if (pixel != 255) {
+				*((byte*)_frontScreen->getBasePtr(x, y)) = pixel;
+			}
+		}
+	}
    change();
 }
 
 }
+
+/* vim: set tabstop=4 noexpandtab: */