[Scummvm-cvs-logs] SF.net SVN: scummvm: [32541] scummvm/trunk/engines/drascula

[thebluegr at users.sourceforge.net]

Revision: 32541
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32541&view=rev
Author:   thebluegr
Date:     2008-06-04 10:41:40 -0700 (Wed, 04 Jun 2008)

Log Message:
-----------
Removed decompressPic() and fixed the animation of Von Braun and his glass cage

Modified Paths:
--------------
    scummvm/trunk/engines/drascula/animation.cpp
    scummvm/trunk/engines/drascula/drascula.cpp
    scummvm/trunk/engines/drascula/drascula.h

Modified: scummvm/trunk/engines/drascula/animation.cpp
===================================================================
--- scummvm/trunk/engines/drascula/animation.cpp	2008-06-04 17:20:25 UTC (rev 32540)
+++ scummvm/trunk/engines/drascula/animation.cpp	2008-06-04 17:41:40 UTC (rev 32541)
@@ -836,7 +836,7 @@
 
 	flags[24] = 1;
 
-	decompressPic(drawSurface1, 1);
+	memcpy(drawSurface1, screenSurface, 64000);
 
 	playSound(7);
 	hiccup(15);

Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp	2008-06-04 17:20:25 UTC (rev 32540)
+++ scummvm/trunk/engines/drascula/drascula.cpp	2008-06-04 17:41:40 UTC (rev 32541)
@@ -283,10 +283,6 @@
 	_arj.read(cPal, 768);
 	_arj.close();
 
-	decompressPic(targetSurface, colorCount);
-}
-
-void DrasculaEngine::decompressPic(byte *targetSurface, int colorCount) {
 	memcpy(targetSurface, pcxBuffer, 64000);
 	free(pcxBuffer);
 	setRGB((byte *)cPal, colorCount);

Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h	2008-06-04 17:20:25 UTC (rev 32540)
+++ scummvm/trunk/engines/drascula/drascula.h	2008-06-04 17:41:40 UTC (rev 32541)
@@ -185,7 +185,6 @@
 	}
 
 	void loadPic(const char *NamePcc, byte *targetSurface, int colorCount = 1);
-	void decompressPic(byte *targetSurface, int colorCount);
 
 	typedef char DacPalette256[256][3];
 


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