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

[thebluegr at users.sourceforge.net]

Revision: 34179
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34179&view=rev
Author:   thebluegr
Date:     2008-08-26 07:48:19 +0000 (Tue, 26 Aug 2008)

Log Message:
-----------
Cleanup

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

Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp	2008-08-26 04:07:51 UTC (rev 34178)
+++ scummvm/trunk/engines/drascula/drascula.cpp	2008-08-26 07:48:19 UTC (rev 34179)
@@ -226,41 +226,35 @@
 		if (currentChapter != 6)
 			loadPic(95, tableSurface);
 
-		if (currentChapter == 1) {
+		if (currentChapter != 3)
 			loadPic(96, frontSurface, COMPLETE_PAL);
-			loadPic(99, backSurface);
-			loadPic(97, extraSurface);
+
+		if (currentChapter == 1) {
 		} else if (currentChapter == 2) {
-			loadPic(96, frontSurface, COMPLETE_PAL);
 			loadPic("pts.alg", drawSurface2);
 		} else if (currentChapter == 3) {
 			loadPic("aux13.alg", bgSurface, COMPLETE_PAL);
 			loadPic(96, frontSurface);
-			loadPic(97, extraSurface);
-			loadPic(99, backSurface);
 		} else if (currentChapter == 4) {
-			loadPic(96, frontSurface, COMPLETE_PAL);
 			if (hay_que_load == 0)
 				animation_ray();
 			loadPic(96, frontSurface);
 			clearRoom();
-			loadPic(99, backSurface);
-			loadPic(97, extraSurface);
 		} else if (currentChapter == 5) {
-			loadPic(96, frontSurface, COMPLETE_PAL);
-			loadPic(97, extraSurface);
-			loadPic(99, backSurface);
 		} else if (currentChapter == 6) {
 			igorX = 105, igorY = 85, trackIgor = 1;
 			drasculaX = 62, drasculaY = 99, trackDrascula = 1;
 			actorFrames[kFramePendulum] = 0;
 			flag_tv = 0;
 
-			loadPic(96, frontSurface, COMPLETE_PAL);
+			loadPic(95, tableSurface);
+		}
+
+		if (currentChapter != 2) {
 			loadPic(99, backSurface);
 			loadPic(97, extraSurface);
-			loadPic(95, tableSurface);
 		}
+
 		memset(iconName, 0, sizeof(iconName));
 
 		for (i = 0; i < 6; i++)


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