[Scummvm-cvs-logs] SF.net SVN: scummvm:[35477] scummvm/trunk/engines/agos

[Kirben at users.sourceforge.net]

Revision: 35477
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35477&view=rev
Author:   Kirben
Date:     2008-12-22 00:32:01 +0000 (Mon, 22 Dec 2008)

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

Modified Paths:
--------------
    scummvm/trunk/engines/agos/res.cpp
    scummvm/trunk/engines/agos/res_snd.cpp

Modified: scummvm/trunk/engines/agos/res.cpp
===================================================================
--- scummvm/trunk/engines/agos/res.cpp	2008-12-21 23:47:35 UTC (rev 35476)
+++ scummvm/trunk/engines/agos/res.cpp	2008-12-22 00:32:01 UTC (rev 35477)
@@ -725,18 +725,8 @@
 			} else if (getGameType() == GType_ELVIRA1 && getFeatures() & GF_DEMO) {
 				if (getPlatform() == Common::kPlatformAtariST)
 					sprintf(filename, "%.2d%d.out", id, type);
-				else if (id == 20)
-					sprintf(filename, "D%d.out", type);
-				else if (id == 26)
-					sprintf(filename, "J%d.out", type);
-				else if (id == 27)
-					sprintf(filename, "K%d.out", type);
-				else if (id == 33)
-					sprintf(filename, "Q%d.out", type);
-				else if (id == 34)
-					sprintf(filename, "R%d.out", type);
 				else
-					sprintf(filename, "%.1d%d.out", id, type);
+					sprintf(filename, "%c%d.out", 48 + id, type);
 			} else if (getGameType() == GType_ELVIRA1 || getGameType() == GType_ELVIRA2) {
 				sprintf(filename, "%.2d%d.pkd", id, type);
 			} else {

Modified: scummvm/trunk/engines/agos/res_snd.cpp
===================================================================
--- scummvm/trunk/engines/agos/res_snd.cpp	2008-12-21 23:47:35 UTC (rev 35476)
+++ scummvm/trunk/engines/agos/res_snd.cpp	2008-12-22 00:32:01 UTC (rev 35477)
@@ -359,19 +359,9 @@
 	uint32 srcSize, dstSize;
 
 	if (getPlatform() == Common::kPlatformAmiga || getPlatform() == Common::kPlatformAtariST) {
-		if (getGameType() == GType_ELVIRA1 && getFeatures() & GF_DEMO) {
-			if (id == 20)
-				sprintf(filename, "D%d.out", type);
-			else if (id == 26)
-				sprintf(filename, "J%d.out", type);
-			else if (id == 27)
-				sprintf(filename, "K%d.out", type);
-			else if (id == 33)
-				sprintf(filename, "Q%d.out", type);
-			else if (id == 34)
-				sprintf(filename, "R%d.out", type);
-			else
-				sprintf(filename, "%.1d%d.out", id, type);
+		if (getGameType() == GType_ELVIRA1 && (getFeatures() & GF_DEMO) &&
+			getPlatform() == Common::kPlatformAmiga) {
+			sprintf(filename, "%c%d.out", 48 + id, type);
 		} else if (getGameType() == GType_ELVIRA1 || getGameType() == GType_ELVIRA2) {
 			sprintf(filename, "%.2d%d.out", id, type);
 		} else {


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