[Scummvm-cvs-logs] SF.net SVN: scummvm: [24112] scummvm/trunk/engines/agos

[kirben at users.sourceforge.net]

Revision: 24112
          http://svn.sourceforge.net/scummvm/?rev=24112&view=rev
Author:   kirben
Date:     2006-10-04 06:29:14 -0700 (Wed, 04 Oct 2006)

Log Message:
-----------
Fix dumping of complete video script output

Modified Paths:
--------------
    scummvm/trunk/engines/agos/agos.cpp
    scummvm/trunk/engines/agos/vga.cpp

Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp	2006-10-04 12:29:37 UTC (rev 24111)
+++ scummvm/trunk/engines/agos/agos.cpp	2006-10-04 13:29:14 UTC (rev 24112)
@@ -1623,6 +1623,16 @@
 		assert(READ_BE_UINT16(&((ImageHeader_WW *) b)->id) == vga_res_id);
 	}
 
+	if (_startVgaScript) {
+		if (getGameType() == GType_FF || getGameType() == GType_PP) {
+			dump_vga_script(_curVgaFile1 + READ_LE_UINT16(&((ImageHeader_Feeble*)b)->scriptOffs), num, vga_res_id);
+		} else if (getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) {
+			dump_vga_script(_curVgaFile1 + READ_BE_UINT16(&((ImageHeader_Simon*)b)->scriptOffs), num, vga_res_id);
+		} else {
+			dump_vga_script(_curVgaFile1 + READ_BE_UINT16(&((ImageHeader_WW*)b)->scriptOffs), num, vga_res_id);
+		}
+	}
+
 	if (getGameType() == GType_SIMON1) {
 		if (vga_res_id == 16300) {
 			clearBackFromTop(134);
@@ -1654,7 +1664,6 @@
 		_vcPtr = _curVgaFile1 + READ_BE_UINT16(&((ImageHeader_WW *) b)->scriptOffs);
 	}
 
-	//dump_vga_script(_vcPtr, num, vga_res_id);
 	runVgaScript();
 	_vcPtr = vc_ptr_org;
 

Modified: scummvm/trunk/engines/agos/vga.cpp
===================================================================
--- scummvm/trunk/engines/agos/vga.cpp	2006-10-04 12:29:37 UTC (rev 24111)
+++ scummvm/trunk/engines/agos/vga.cpp	2006-10-04 13:29:14 UTC (rev 24112)
@@ -480,6 +480,16 @@
 		assert(READ_BE_UINT16(&((ImageHeader_WW *) b)->id) == num);
 	}
 
+	if (_startVgaScript) {
+		if (getGameType() == GType_FF || getGameType() == GType_PP) {
+			dump_vga_script(_curVgaFile1 + READ_LE_UINT16(&((ImageHeader_Feeble*)b)->scriptOffs), res, num);
+		} else if (getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) {
+			dump_vga_script(_curVgaFile1 + READ_BE_UINT16(&((ImageHeader_Simon*)b)->scriptOffs), res, num);
+		} else {
+			dump_vga_script(_curVgaFile1 + READ_BE_UINT16(&((ImageHeader_WW*)b)->scriptOffs), res, num);
+		}
+	}
+
 	vcPtrOrg = _vcPtr;
 
 	if (getGameType() == GType_FF || getGameType() == GType_PP) {
@@ -490,7 +500,6 @@
 		_vcPtr = _curVgaFile1 + READ_BE_UINT16(&((ImageHeader_WW *) b)->scriptOffs);
 	}
 
-	//dump_vga_script(_vcPtr, res, num);
 	runVgaScript();
 
 	_curVgaFile1 = old_file_1;


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