From 056b69f0c8b2c69f3040fa54268b22c6463627b0 Mon Sep 17 00:00:00 2001
From: johndoe123
Date: Tue, 5 Jul 2011 18:19:46 +0000
Subject: NEVERHOOD: Module1000 and Scene1001 skeletons

- Implement BaseSurface::drawSpriteResourceEx
- Use CollisionMan in Scene
- Some cleanup
---
 engines/neverhood/resource.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines/neverhood/resource.cpp')

diff --git a/engines/neverhood/resource.cpp b/engines/neverhood/resource.cpp
index 300cf8195a..c122ca2e5e 100644
--- a/engines/neverhood/resource.cpp
+++ b/engines/neverhood/resource.cpp
@@ -220,10 +220,10 @@ bool AnimResource::load(uint32 fileHash) {
 		AnimFrameInfo frameInfo;
 		frameInfo.frameHash = READ_LE_UINT32(frameList);
 		frameInfo.counter = READ_LE_UINT16(frameList + 4);
-		frameInfo.rect.x1 = READ_LE_UINT16(frameList + 6);
-		frameInfo.rect.y1 = READ_LE_UINT16(frameList + 8);
-		frameInfo.rect.x2 = READ_LE_UINT16(frameList + 10);
-		frameInfo.rect.y2 = READ_LE_UINT16(frameList + 12);
+		frameInfo.rect.x = READ_LE_UINT16(frameList + 6);
+		frameInfo.rect.y = READ_LE_UINT16(frameList + 8);
+		frameInfo.rect.width = READ_LE_UINT16(frameList + 10);
+		frameInfo.rect.height = READ_LE_UINT16(frameList + 12);
 		frameInfo.deltaX = READ_LE_UINT16(frameList + 14);
 		frameInfo.deltaY = READ_LE_UINT16(frameList + 16);
 		frameInfo.deltaRect.x = READ_LE_UINT16(frameList + 18); 
@@ -234,7 +234,7 @@ bool AnimResource::load(uint32 fileHash) {
 		frameInfo.spriteDataOffs = READ_LE_UINT32(frameList + 28);
 		debug("frameHash = %08X; counter = %d; rect = (%d,%d,%d,%d); deltaX = %d; deltaY = %d; deltaRect = (%d,%d,%d,%d); field_1A = %04X; spriteDataOffs = %08X", 
 			frameInfo.frameHash, frameInfo.counter, 
-			frameInfo.rect.x1, frameInfo.rect.y1, frameInfo.rect.x2, frameInfo.rect.y2,
+			frameInfo.rect.x, frameInfo.rect.y, frameInfo.rect.width, frameInfo.rect.height,
 			frameInfo.deltaX, frameInfo.deltaY,
 			frameInfo.deltaRect.x, frameInfo.deltaRect.y, frameInfo.deltaRect.width, frameInfo.deltaRect.height,
 			frameInfo.field_1A, frameInfo.spriteDataOffs);
-- 
cgit v1.2.3