From eb054471e0814768571c550a4d268e73e1ea6b65 Mon Sep 17 00:00:00 2001
From: johndoe123
Date: Mon, 22 Oct 2012 11:15:10 +0000
Subject: NEVERHOOD: Fix _drawRects in AsScene1002Door and SsCommonPressButton

---
 engines/neverhood/module1000.cpp | 48 ++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/engines/neverhood/module1000.cpp b/engines/neverhood/module1000.cpp
index 4f8f584313..6a819181e1 100644
--- a/engines/neverhood/module1000.cpp
+++ b/engines/neverhood/module1000.cpp
@@ -618,10 +618,10 @@ AsScene1002Door::AsScene1002Door(NeverhoodEngine *vm, NRect &clipRect)
 		_y = 239; 
 	}
 
-	_surface->getDrawRect().x = 0;
-	_surface->getDrawRect().y = 0;
-	_surface->getDrawRect().width = _spriteResource.getDimensions().width;
-	_surface->getDrawRect().height = _spriteResource.getDimensions().height;
+	_drawRect.x = 0;
+	_drawRect.y = 0;
+	_drawRect.width = _spriteResource.getDimensions().width;
+	_drawRect.height = _spriteResource.getDimensions().height;
 
 	_needRefresh = true;
 	
@@ -771,10 +771,10 @@ SsCommonPressButton::SsCommonPressButton(NeverhoodEngine *vm, Scene *parentScene
 	_spriteResource.load2(fileHash1);
 	createSurface(surfacePriority, 40, 40);
 	
-	_surface->getDrawRect().x = 0;
-	_surface->getDrawRect().y = 0;
-	_surface->getDrawRect().width = _spriteResource.getDimensions().width;
-	_surface->getDrawRect().height = _spriteResource.getDimensions().height;
+	_drawRect.x = 0;
+	_drawRect.y = 0;
+	_drawRect.width = _spriteResource.getDimensions().width;
+	_drawRect.height = _spriteResource.getDimensions().height;
 	_x = _spriteResource.getPosition().x;
 	_y = _spriteResource.getPosition().y;
 
@@ -791,20 +791,20 @@ void SsCommonPressButton::setFileHashes(uint32 fileHash1, uint32 fileHash2) {
 	_fileHashes[1] = fileHash2;
 	if (_status == 2) {
 		_spriteResource.load2(fileHash2);
-		_surface->getDrawRect().x = 0;
-		_surface->getDrawRect().y = 0;
-		_surface->getDrawRect().width = _spriteResource.getDimensions().width;
-		_surface->getDrawRect().height = _spriteResource.getDimensions().height;
+		_drawRect.x = 0;
+		_drawRect.y = 0;
+		_drawRect.width = _spriteResource.getDimensions().width;
+		_drawRect.height = _spriteResource.getDimensions().height;
 		_x = _spriteResource.getPosition().x;
 		_y = _spriteResource.getPosition().y;
 		_needRefresh = true;
 		StaticSprite::update();
 	} else {
 		_spriteResource.load2(fileHash1);
-		_surface->getDrawRect().x = 0;
-		_surface->getDrawRect().y = 0;
-		_surface->getDrawRect().width = _spriteResource.getDimensions().width;
-		_surface->getDrawRect().height = _spriteResource.getDimensions().height;
+		_drawRect.x = 0;
+		_drawRect.y = 0;
+		_drawRect.width = _spriteResource.getDimensions().width;
+		_drawRect.height = _spriteResource.getDimensions().height;
 		_x = _spriteResource.getPosition().x;
 		_y = _spriteResource.getPosition().y;
 		_needRefresh = true;
@@ -817,10 +817,10 @@ void SsCommonPressButton::update() {
 		if (_status == 1) {
 			_status = 2;
 			_spriteResource.load2(_fileHashes[1]);
-			_surface->getDrawRect().x = 0;
-			_surface->getDrawRect().y = 0;
-			_surface->getDrawRect().width = _spriteResource.getDimensions().width;
-			_surface->getDrawRect().height = _spriteResource.getDimensions().height;
+			_drawRect.x = 0;
+			_drawRect.y = 0;
+			_drawRect.width = _spriteResource.getDimensions().width;
+			_drawRect.height = _spriteResource.getDimensions().height;
 			_x = _spriteResource.getPosition().x;
 			_y = _spriteResource.getPosition().y;
 			_needRefresh = true;
@@ -829,10 +829,10 @@ void SsCommonPressButton::update() {
 		} else if (_status == 2) {
 			_status = 3;
 			_spriteResource.load2(_fileHashes[0]);
-			_surface->getDrawRect().x = 0;
-			_surface->getDrawRect().y = 0;
-			_surface->getDrawRect().width = _spriteResource.getDimensions().width;
-			_surface->getDrawRect().height = _spriteResource.getDimensions().height;
+			_drawRect.x = 0;
+			_drawRect.y = 0;
+			_drawRect.width = _spriteResource.getDimensions().width;
+			_drawRect.height = _spriteResource.getDimensions().height;
 			_x = _spriteResource.getPosition().x;
 			_y = _spriteResource.getPosition().y;
 			_needRefresh = true;
-- 
cgit v1.2.3