[Scummvm-cvs-logs] SF.net SVN: scummvm:[54595] scummvm/trunk/engines/mohawk

bgk at users.sourceforge.net bgk at users.sourceforge.net
Mon Nov 29 21:50:11 CET 2010


Revision: 54595
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54595&view=rev
Author:   bgk
Date:     2010-11-29 20:50:11 +0000 (Mon, 29 Nov 2010)

Log Message:
-----------
MOHAWK: Keep resource type around

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/myst.cpp
    scummvm/trunk/engines/mohawk/myst.h

Modified: scummvm/trunk/engines/mohawk/myst.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst.cpp	2010-11-29 20:49:56 UTC (rev 54594)
+++ scummvm/trunk/engines/mohawk/myst.cpp	2010-11-29 20:50:11 UTC (rev 54595)
@@ -890,6 +890,7 @@
 }
 
 static MystResource *loadResource(MohawkEngine_Myst *vm, Common::SeekableReadStream *rlstStream, MystResource *parent) {
+	MystResource *resource = 0;
 	uint16 type = rlstStream->readUint16LE();
 
 	debugC(kDebugResource, "\tType: %d", type);
@@ -902,26 +903,39 @@
 	case kMystDownResource:
 	case kMystUpResource:
 	case 14: // TODO: kMystBackwardResource?
-		return new MystResource(vm, rlstStream, parent);
+		resource = new MystResource(vm, rlstStream, parent);
+		break;
 	case kMystActionResource:
-		return new MystResourceType5(vm, rlstStream, parent);
+		resource =  new MystResourceType5(vm, rlstStream, parent);
+		break;
 	case kMystVideoResource:
-		return new MystResourceType6(vm, rlstStream, parent);
+		resource =  new MystResourceType6(vm, rlstStream, parent);
+		break;
 	case kMystSwitchResource:
-		return new MystResourceType7(vm, rlstStream, parent);
+		resource =  new MystResourceType7(vm, rlstStream, parent);
+		break;
 	case 8:
-		return new MystResourceType8(vm, rlstStream, parent);
+		resource =  new MystResourceType8(vm, rlstStream, parent);
+		break;
 	case 10:
-		return new MystResourceType10(vm, rlstStream, parent);
+		resource =  new MystResourceType10(vm, rlstStream, parent);
+		break;
 	case 11:
-		return new MystResourceType11(vm, rlstStream, parent);
+		resource =  new MystResourceType11(vm, rlstStream, parent);
+		break;
 	case 12:
-		return new MystResourceType12(vm, rlstStream, parent);
+		resource =  new MystResourceType12(vm, rlstStream, parent);
+		break;
 	case 13:
-		return new MystResourceType13(vm, rlstStream, parent);
+		resource =  new MystResourceType13(vm, rlstStream, parent);
+		break;
 	default:
 		error ("Unknown/Unhandled MystResource type %d", type);
 	}
+
+	resource->type = type;
+
+	return resource;
 }
 
 void MohawkEngine_Myst::loadResources() {

Modified: scummvm/trunk/engines/mohawk/myst.h
===================================================================
--- scummvm/trunk/engines/mohawk/myst.h	2010-11-29 20:49:56 UTC (rev 54594)
+++ scummvm/trunk/engines/mohawk/myst.h	2010-11-29 20:50:11 UTC (rev 54595)
@@ -154,6 +154,7 @@
 	virtual ~MystResource();
 
 	MystResource *_parent;
+	uint16 type;
 
 	bool contains(Common::Point point) { return _rect.contains(point); }
 	virtual void drawDataToScreen() {}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list