[Scummvm-cvs-logs] SF.net SVN: scummvm:[52143] scummvm/trunk/engines/sci/engine/script_patches .cpp

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Tue Aug 17 12:26:12 CEST 2010


Revision: 52143
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52143&view=rev
Author:   m_kiewitz
Date:     2010-08-17 10:26:12 +0000 (Tue, 17 Aug 2010)

Log Message:
-----------
SCI: commenting out hoyle 4 script patch

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/script_patches.cpp

Modified: scummvm/trunk/engines/sci/engine/script_patches.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/script_patches.cpp	2010-08-17 10:19:06 UTC (rev 52142)
+++ scummvm/trunk/engines/sci/engine/script_patches.cpp	2010-08-17 10:26:12 UTC (rev 52143)
@@ -258,63 +258,63 @@
 //  we would get an invalid port handle to a kSetPort call. We just patch in
 //  resetting of the port selector. We destroy the stop/fade code in there,
 //  it seems it isn't used at all in the game.
-const byte hoyle4SignaturePortFix[] = {
-	28,
-	0x39, 0x09,        // pushi 09
-	0x89, 0x0b,        // lsg 0b
-	0x39, 0x64,        // pushi 64
-	0x38, 0xc8, 0x00,  // pushi 00c8
-	0x38, 0x2c, 0x01,  // pushi 012c
-	0x38, 0x90, 0x01,  // pushi 0190
-	0x38, 0xf4, 0x01,  // pushi 01f4
-	0x38, 0x58, 0x02,  // pushi 0258
-	0x38, 0xbc, 0x02,  // pushi 02bc
-	0x38, 0x20, 0x03,  // pushi 0320
-	0x46,              // calle [xxxx] [xxxx] [xx]
-	+5, 43,            // [skip 5 bytes]
-	0x30, 0x27, 0x00,  // bnt 0027 -> end of routine
-	0x87, 0x00,        // lap 00
-	0x30, 0x19, 0x00,  // bnt 0019 -> fade out
-	0x87, 0x01,        // lap 01
-	0x30, 0x14, 0x00,  // bnt 0014 -> fade out
-	0x38, 0xa7, 0x00,  // pushi 00a7
-	0x76,              // push0
-	0x80, 0x29, 0x01,  // lag 0129
-	0x4a, 0x04,        // send 04 (song::stop)
-	0x39, 0x27,        // pushi 27
-	0x78,              // push1
-	0x8f, 0x01,        // lsp 01
-	0x51, 0x54,        // class 54
-	0x4a, 0x06,        // send 06 (PlaySong::play)
-	0x33, 0x09,        // jmp 09 -> end of routine
-	0x38, 0xaa, 0x00,  // pushi 00aa
-	0x76,              // push0
-	0x80, 0x29, 0x01,  // lag 0129
-	0x4a, 0x04,        // send 04
-	0x48,              // ret
-	0
-};
+//const byte hoyle4SignaturePortFix[] = {
+//	28,
+//	0x39, 0x09,        // pushi 09
+//	0x89, 0x0b,        // lsg 0b
+//	0x39, 0x64,        // pushi 64
+//	0x38, 0xc8, 0x00,  // pushi 00c8
+//	0x38, 0x2c, 0x01,  // pushi 012c
+//	0x38, 0x90, 0x01,  // pushi 0190
+//	0x38, 0xf4, 0x01,  // pushi 01f4
+//	0x38, 0x58, 0x02,  // pushi 0258
+//	0x38, 0xbc, 0x02,  // pushi 02bc
+//	0x38, 0x20, 0x03,  // pushi 0320
+//	0x46,              // calle [xxxx] [xxxx] [xx]
+//	+5, 43,            // [skip 5 bytes]
+//	0x30, 0x27, 0x00,  // bnt 0027 -> end of routine
+//	0x87, 0x00,        // lap 00
+//	0x30, 0x19, 0x00,  // bnt 0019 -> fade out
+//	0x87, 0x01,        // lap 01
+//	0x30, 0x14, 0x00,  // bnt 0014 -> fade out
+//	0x38, 0xa7, 0x00,  // pushi 00a7
+//	0x76,              // push0
+//	0x80, 0x29, 0x01,  // lag 0129
+//	0x4a, 0x04,        // send 04 (song::stop)
+//	0x39, 0x27,        // pushi 27
+//	0x78,              // push1
+//	0x8f, 0x01,        // lsp 01
+//	0x51, 0x54,        // class 54
+//	0x4a, 0x06,        // send 06 (PlaySong::play)
+//	0x33, 0x09,        // jmp 09 -> end of routine
+//	0x38, 0xaa, 0x00,  // pushi 00aa
+//	0x76,              // push0
+//	0x80, 0x29, 0x01,  // lag 0129
+//	0x4a, 0x04,        // send 04
+//	0x48,              // ret
+//	0
+//};
 
-const uint16 hoyle4PatchPortFix[] = {
-	PATCH_ADDTOOFFSET | +33,
-	0x38, 0x31, 0x01,  // pushi 0131 (selector curEvent)
-	0x76,              // push0
-	0x80, 0x50, 0x00,  // lag 0050 (global var 80h, "User")
-	0x4a, 0x04,        // send 04 (read User::curEvent)
+//const uint16 hoyle4PatchPortFix[] = {
+//	PATCH_ADDTOOFFSET | +33,
+//	0x38, 0x31, 0x01,  // pushi 0131 (selector curEvent)
+//	0x76,              // push0
+//	0x80, 0x50, 0x00,  // lag 0050 (global var 80h, "User")
+//	0x4a, 0x04,        // send 04 (read User::curEvent)
+//
+//	0x38, 0x93, 0x00,  // pushi 0093 (selector port)
+//	0x78,              // push1
+//	0x76,              // push0
+//	0x4a, 0x06,        // send 06 (write 0 to that object::port)
+//	0x48,              // ret
+//	PATCH_END
+//};
 
-	0x38, 0x93, 0x00,  // pushi 0093 (selector port)
-	0x78,              // push1
-	0x76,              // push0
-	0x4a, 0x06,        // send 06 (write 0 to that object::port)
-	0x48,              // ret
-	PATCH_END
-};
-
 //    script, description,                                   magic DWORD,                                 adjust
-const SciScriptSignature hoyle4Signatures[] = {
-    {      0, "port fix when disposing windows",             PATCH_MAGICDWORD(0x64, 0x38, 0xC8, 0x00),    -5, hoyle4SignaturePortFix,   hoyle4PatchPortFix },
-    {      0, NULL,                                          0,                                            0, NULL,                     NULL }
-};
+//const SciScriptSignature hoyle4Signatures[] = {
+//    {      0, "port fix when disposing windows",             PATCH_MAGICDWORD(0x64, 0x38, 0xC8, 0x00),    -5, hoyle4SignaturePortFix,   hoyle4PatchPortFix },
+//    {      0, NULL,                                          0,                                            0, NULL,                     NULL }
+//};
 
 // ===========================================================================
 // at least during harpy scene export 29 of script 0 is called in kq5cd and


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