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

[thebluegr at users.sourceforge.net]

Revision: 32534
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32534&view=rev
Author:   thebluegr
Date:     2008-06-04 03:29:28 -0700 (Wed, 04 Jun 2008)

Log Message:
-----------
Simplified some more calls to loadPic()

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

Modified: scummvm/trunk/engines/drascula/animation.cpp
===================================================================
--- scummvm/trunk/engines/drascula/animation.cpp	2008-06-04 10:27:10 UTC (rev 32533)
+++ scummvm/trunk/engines/drascula/animation.cpp	2008-06-04 10:29:28 UTC (rev 32534)
@@ -994,9 +994,7 @@
 
 asco:
 	loadPic(roomDisk, drawSurface3);
-	char rm[20];
-	sprintf(rm, "%i.alg", roomNumber);
-	loadPic(rm, drawSurface1, HALF_PAL);
+	loadPic(roomNumber, drawSurface1, HALF_PAL);
 	black();
 	updateRoom();
 	updateScreen();

Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp	2008-06-04 10:27:10 UTC (rev 32533)
+++ scummvm/trunk/engines/drascula/drascula.cpp	2008-06-04 10:29:28 UTC (rev 32534)
@@ -900,12 +900,10 @@
 		}
 		characterMoved = 0;
 	}
+
 	loadPic(roomDisk, drawSurface3);
+	loadPic(roomNumber, drawSurface1, HALF_PAL);
 
-	char rm[20];
-	sprintf(rm, "%i.alg", roomNumber);
-	loadPic(rm, drawSurface1, HALF_PAL);
-
 	copyBackground(0, 171, 0, 0, OBJWIDTH, OBJHEIGHT, backSurface, drawSurface3);
 
 	setDefaultPalette();
@@ -1457,9 +1455,7 @@
 	}
 
 	clearRoom();
-	char rm[20];
-	sprintf(rm, "%i.alg", roomNumber);
-	loadPic(rm, drawSurface1, HALF_PAL);
+	loadPic(roomNumber, drawSurface1, HALF_PAL);
 	selectionMade = 0;
 
 	return true;
@@ -1679,9 +1675,7 @@
 	free(copia);
 	free(ghost);
 
-	char rm[20];
-	sprintf(rm, "%i.alg", roomNumber);
-	loadPic(rm, drawSurface1, HALF_PAL);
+	loadPic(roomNumber, drawSurface1, HALF_PAL);
 }
 
 void DrasculaEngine::fliplay(const char *filefli, int vel) {


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