[Scummvm-cvs-logs] SF.net SVN: scummvm:[44636] scummvm/trunk/engines/sci/gui/gui_view.cpp

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Sun Oct 4 23:30:28 CEST 2009


Revision: 44636
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44636&view=rev
Author:   m_kiewitz
Date:     2009-10-04 21:30:13 +0000 (Sun, 04 Oct 2009)

Log Message:
-----------
SCI/newgui: SciGUIview class now uses resmanager to detect view format

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui/gui_view.cpp

Modified: scummvm/trunk/engines/sci/gui/gui_view.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_view.cpp	2009-10-04 21:27:24 UTC (rev 44635)
+++ scummvm/trunk/engines/sci/gui/gui_view.cpp	2009-10-04 21:30:13 UTC (rev 44636)
@@ -57,15 +57,18 @@
 	uint16 headerSize = 0;
 	uint16 loopSize = 0, cellSize = 0;
 	int loopNo, cellNo;
-	int16 version;
 	byte seekEntry;
 
 	_embeddedPal = false;
 	_loopCount = 0;
 
-	version = READ_LE_UINT16(_resourceData + 4);
-	switch (version) {
-		case 0: // View-format SCI1
+
+	switch (_s->resMan->getViewType()) {
+	case kViewEga: // View-format SCI0/SCI0
+		// FIXME: seems to be almost the same as kViewVga
+		break;
+
+	case kViewVga: // View-format SCI1
 		// LoopCount:WORD MirrorMask:WORD Version:WORD PaletteOffset:WORD LoopOffset0:WORD LoopOffset1:WORD...
 		
 		// bit 0x8000 of _resourceData[1] means palette is set
@@ -109,7 +112,7 @@
 		}
 		break;
 
-		case 1: // View-format SCI1.1
+	case kViewVga11: // View-format SCI1.1
 		// LoopCount:WORD MirrorMask:WORD Version:WORD PaletteOffset:WORD LoopOffset0:WORD LoopOffset1:WORD...
 		// HeaderSize:WORD LoopCount:WORD Version:WORD Unknown:WORD PaletteOffset:WORD
 		headerSize = READ_LE_UINT16(_resourceData + 0);
@@ -159,6 +162,13 @@
 			}
 		}
 		break;
+
+	case kViewAmiga: // View-format on amiga
+		// FIXME
+		break;
+
+	default:
+		error("ViewType was not detected, can't continue");
 	}
 }
 


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