[Scummvm-cvs-logs] SF.net SVN: scummvm:[54220] scummvm/trunk/engines/sci

[mthreepwood at users.sourceforge.net]

Revision: 54220
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54220&view=rev
Author:   mthreepwood
Date:     2010-11-13 00:20:23 +0000 (Sat, 13 Nov 2010)

Log Message:
-----------
SCI: Update resource types for SCI2.1/3

Modified Paths:
--------------
    scummvm/trunk/engines/sci/resource.cpp
    scummvm/trunk/engines/sci/resource.h

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2010-11-12 22:31:04 UTC (rev 54219)
+++ scummvm/trunk/engines/sci/resource.cpp	2010-11-13 00:20:23 UTC (rev 54220)
@@ -114,7 +114,8 @@
 	"patch", "bitmap", "palette", "cdaudio",
 	"audio", "sync", "message", "map", "heap",
 	"audio36", "sync36", "xlate", "robot", "vmd",
-	"chunk", "macibin", "macibis", "macpict"
+	"chunk", "animation", "etc", "duck", "clut",
+	"tga", "zzz", "macibin", "macibis", "macpict"
 };
 
 // Resource type suffixes. Note that the
@@ -126,7 +127,8 @@
 	"bit", "pal", "cda", "aud", "syn",
 	"msg", "map", "hep",    "",    "",
 	"trn", "rbt", "vmd", "chk",    "",
-	   "",    ""
+	"etc", "duk", "clu", "tga", "zzz",
+	   "",    "",    ""
 }; 
 
 const char *getResourceTypeName(ResourceType restype) {
@@ -147,12 +149,13 @@
 
 // TODO: 12 should be "Wave", but SCI seems to just store it in Audio resources
 static const ResourceType s_resTypeMapSci21[] = {
-	kResourceTypeView, kResourceTypePic, kResourceTypeScript, kResourceTypeText,          // 0x00-0x03
-	kResourceTypeSound, kResourceTypeMemory, kResourceTypeVocab, kResourceTypeFont,       // 0x04-0x07
+	kResourceTypeView, kResourceTypePic, kResourceTypeScript, kResourceTypeAnimation,     // 0x00-0x03
+	kResourceTypeSound, kResourceTypeEtc, kResourceTypeVocab, kResourceTypeFont,          // 0x04-0x07
 	kResourceTypeCursor, kResourceTypePatch, kResourceTypeBitmap, kResourceTypePalette,   // 0x08-0x0B
 	kResourceTypeInvalid, kResourceTypeAudio, kResourceTypeSync, kResourceTypeMessage,    // 0x0C-0x0F
 	kResourceTypeMap, kResourceTypeHeap, kResourceTypeChunk, kResourceTypeAudio36,        // 0x10-0x13
-	kResourceTypeSync36, kResourceTypeTranslation, kResourceTypeRobot, kResourceTypeVMD   // 0x14-0x17
+	kResourceTypeSync36, kResourceTypeTranslation, kResourceTypeRobot, kResourceTypeVMD,  // 0x14-0x17
+	kResourceTypeDuck, kResourceTypeClut, kResourceTypeTGA, kResourceTypeZZZ              // 0x18-0x1B
 };
 
 ResourceType ResourceManager::convertResType(byte type) {
@@ -1442,7 +1445,7 @@
 
 	for (int i = kResourceTypeView; i < kResourceTypeInvalid; ++i) {
 		// Ignore the types that can't be patched (and Robot/VMD is handled externally for now)
-		if (!s_resourceTypeSuffixes[i] || i == kResourceTypeRobot || i == kResourceTypeVMD)
+		if (!s_resourceTypeSuffixes[i] || (i >= kResourceTypeRobot && i != kResourceTypeChunk))
 			continue;
 
 		files.clear();

Modified: scummvm/trunk/engines/sci/resource.h
===================================================================
--- scummvm/trunk/engines/sci/resource.h	2010-11-12 22:31:04 UTC (rev 54219)
+++ scummvm/trunk/engines/sci/resource.h	2010-11-13 00:20:23 UTC (rev 54220)
@@ -96,10 +96,20 @@
 	kResourceTypeAudio36,
 	kResourceTypeSync36,
 	kResourceTypeTranslation, // Currently unsupported
+
+	// SCI2.1+ Resources
 	kResourceTypeRobot,
 	kResourceTypeVMD,
 	kResourceTypeChunk,
+	kResourceTypeAnimation,
 
+	// SCI3 Resources
+	kResourceTypeEtc,
+	kResourceTypeDuck,
+	kResourceTypeClut,
+	kResourceTypeTGA,
+	kResourceTypeZZZ,
+
 	// Mac-only resources
 	kResourceTypeMacIconBarPictN, // IBIN resources (icon bar, not selected)
 	kResourceTypeMacIconBarPictS, // IBIS resources (icon bar, selected)


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