[Scummvm-cvs-logs] SF.net SVN: scummvm:[54161] scummvm/trunk/engines/sci/resource.cpp

[mthreepwood at users.sourceforge.net]

Revision: 54161
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54161&view=rev
Author:   mthreepwood
Date:     2010-11-09 16:23:08 +0000 (Tue, 09 Nov 2010)

Log Message:
-----------
SCI: Formatting convention fixes

Modified Paths:
--------------
    scummvm/trunk/engines/sci/resource.cpp

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2010-11-09 16:06:33 UTC (rev 54160)
+++ scummvm/trunk/engines/sci/resource.cpp	2010-11-09 16:23:08 UTC (rev 54161)
@@ -829,8 +829,7 @@
 
 	scanNewSources();
 
-	if (!addInternalSources())
-	{
+	if (!addInternalSources()) {
 		error("Somehow I can't seem to find the sound files I need (RESOURCE.AUD/RESOURCE.SFX), aborting");
 		return;
 	}
@@ -1033,9 +1032,9 @@
 	case kResVersionSci11Mac:
 		return "Mac SCI1.1+";
 	case kResVersionSci2:
-		return "SCI32 version 2/2.1";
+		return "SCI2/2.1";
 	case kResVersionSci3:
-		return "SCI32 version 3";
+		return "SCI3";
 	}
 
 	return "Version not valid";
@@ -1195,16 +1194,13 @@
 
 		int chk;
 
-		if (curVersion == kResVersionSci0Sci1Early) 
-		{
+		if (curVersion == kResVersionSci0Sci1Early)
 			chk = 4;
-		} else if (curVersion < kResVersionSci2)
-		{
+		else if (curVersion < kResVersionSci2)
 			chk = 20;
-		} else
-		{
+		else
 			chk = 32; // We don't need this, but include it for completeness
-		}
+
 		int offs = curVersion < kResVersionSci11 ? 4 : 0;
 		if ((curVersion < kResVersionSci2 && wCompression > chk)
 				|| (curVersion == kResVersionSci2 && wCompression != 0 && wCompression != 32)
@@ -2056,7 +2052,6 @@
 		// SCI2.1/3 and SCI1 Late resource maps are the same, except that
 		// SCI1 Late resource maps have the resource types or'd with
 		// 0x80. We differentiate between SCI2 and SCI2.1/3 based on that.
-		// TODO: Differentiate between SCI2.1 and SCI3
 		if (_mapVersion == kResVersionSci1Late) {
 			s_sciVersion = SCI_VERSION_2;
 			return;
@@ -2064,8 +2059,7 @@
 			s_sciVersion = SCI_VERSION_2_1;
 			return;
 // Enable SCI3 games by uncommenting the below lines
-//		} else
-//		{
+//		} else {
 //			s_sciVersion = SCI_VERSION_3;
 //			return;
 		}


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