[Scummvm-cvs-logs] SF.net SVN: scummvm: [30104] scummvm/trunk/engines/lure

[dreammaster at users.sourceforge.net]

Revision: 30104
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30104&view=rev
Author:   dreammaster
Date:     2007-12-31 05:37:14 -0800 (Mon, 31 Dec 2007)

Log Message:
-----------
Bugfix to data position start in vga decoder, and made ega/vga decoder methods public visibility

Modified Paths:
--------------
    scummvm/trunk/engines/lure/decode.cpp
    scummvm/trunk/engines/lure/decode.h

Modified: scummvm/trunk/engines/lure/decode.cpp
===================================================================
--- scummvm/trunk/engines/lure/decode.cpp	2007-12-31 13:26:29 UTC (rev 30103)
+++ scummvm/trunk/engines/lure/decode.cpp	2007-12-31 13:37:14 UTC (rev 30104)
@@ -224,7 +224,7 @@
 	// Set up initial states
 	dataIn = src;
 	outputOffset = 0;
-	dataPos = READ_LE_UINT32(dataIn + 0x400);
+	dataPos = READ_LE_UINT32(dataIn->data() + 0x400);
 	dataPos2 = 0x404;
 
 	CH = ESBX();

Modified: scummvm/trunk/engines/lure/decode.h
===================================================================
--- scummvm/trunk/engines/lure/decode.h	2007-12-31 13:26:29 UTC (rev 30103)
+++ scummvm/trunk/engines/lure/decode.h	2007-12-31 13:37:14 UTC (rev 30104)
@@ -48,10 +48,10 @@
 	void decrCtr();
 	bool shlCarry();
 
+public:
+	MemoryBlock *decode(MemoryBlock *src, uint32 maxOutputSize  = SCREEN_SIZE + 1);
 	MemoryBlock *egaDecode(MemoryBlock *src, uint32 maxOutputSize);
 	MemoryBlock *vgaDecode(MemoryBlock *src, uint32 maxOutputSize);
-public:
-	MemoryBlock *decode(MemoryBlock *src, uint32 maxOutputSize  = SCREEN_SIZE + 1);
 };
 
 class AnimationDecoder {


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