[Scummvm-cvs-logs] SF.net SVN: scummvm:[45553] scummvm/trunk/engines/sci/engine

[lordhoto at users.sourceforge.net]

Revision: 45553
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45553&view=rev
Author:   lordhoto
Date:     2009-10-30 23:44:12 +0000 (Fri, 30 Oct 2009)

Log Message:
-----------
Formatting.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kgraphics.cpp
    scummvm/trunk/engines/sci/engine/kmisc.cpp

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-10-30 22:55:35 UTC (rev 45552)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-10-30 23:44:12 UTC (rev 45553)
@@ -632,41 +632,35 @@
 	uint16 operation = argv[0].toUint16();
 
 	switch (operation) {
-		case 0:	// load resource (the corresponding .BIN file from the ACTORS directory)
-			{
-			Common::String resName = s->_segMan->getString(argv[1]);
-			warning("kPortrait, load portrait %s", resName.c_str());
-			// TODO
-			}
-			break;
-		case 1:	// show portrait
-			{
-			Common::String resName = s->_segMan->getString(argv[1]);
+	case 0: { // load resource (the corresponding .BIN file from the ACTORS directory)
+		Common::String resName = s->_segMan->getString(argv[1]);
+		warning("kPortrait, load portrait %s", resName.c_str());
+		// TODO
+		} break;
+	case 1: { // show portrait
+		Common::String resName = s->_segMan->getString(argv[1]);
 
-			// Show the portrait and sync the sound resource (like kDoSync)
-			/*
-			Common::Point portraitPos = Common::Point(argv[2].toUint16(), argv[3].toUint16());
-			uint resourceNum = argv[4].toUint16() & 0xff;
-			uint noun = argv[5].toUint16() & 0xff;
-			uint verb = argv[6].toUint16() & 0xff;
-			uint cond = argv[7].toUint16() & 0xff;
-			uint seq = argv[8].toUint16() & 0xff;
-			// argv[9] is usually 0
-			*/
+		// Show the portrait and sync the sound resource (like kDoSync)
+		/*
+		Common::Point portraitPos = Common::Point(argv[2].toUint16(), argv[3].toUint16());
+		uint resourceNum = argv[4].toUint16() & 0xff;
+		uint noun = argv[5].toUint16() & 0xff;
+		uint verb = argv[6].toUint16() & 0xff;
+		uint cond = argv[7].toUint16() & 0xff;
+		uint seq = argv[8].toUint16() & 0xff;
+		// argv[9] is usually 0
+		*/
 
-			warning("kPortrait, show portrait %s", resName.c_str());
-			// TODO
-			}
-			break;
-		case 2:	// unload resource
-			{
-			uint16 portraitId = argv[1].toUint16();
-			warning("kPortrait, unload portrait ID %d", portraitId);
-			// TODO
-			}
-			break;
-		default:
-			warning("kPortrait(%d), not implemented (argc = %d)", operation, argc);
+		warning("kPortrait, show portrait %s", resName.c_str());
+		// TODO
+		} break;
+	case 2: { // unload resource
+		uint16 portraitId = argv[1].toUint16();
+		warning("kPortrait, unload portrait ID %d", portraitId);
+		// TODO
+		} break;
+	default:
+		warning("kPortrait(%d), not implemented (argc = %d)", operation, argc);
 	}
 
 	return NULL_REG;

Modified: scummvm/trunk/engines/sci/engine/kmisc.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmisc.cpp	2009-10-30 22:55:35 UTC (rev 45552)
+++ scummvm/trunk/engines/sci/engine/kmisc.cpp	2009-10-30 23:44:12 UTC (rev 45553)
@@ -253,17 +253,17 @@
 	uint16 operation = argv[0].toUint16();
 
 	switch (operation) {
-		case kPlatformGetPlatform:
-			return make_reg(0, (isWindows) ? kSciPlatformWindows : kSciPlatformDOS);
-		case kPlatformUnk5:
-			// This case needs to return the opposite of case 6 to get hires graphics
-			return make_reg(0, !isWindows);
-		case kPlatformIsHiRes:
-			return make_reg(0, isWindows);
-		case kPlatformIsItWindows:
-			return make_reg(0, isWindows);
-		default:
-			warning("Unsupported kPlatform operation %d", operation);
+	case kPlatformGetPlatform:
+		return make_reg(0, (isWindows) ? kSciPlatformWindows : kSciPlatformDOS);
+	case kPlatformUnk5:
+		// This case needs to return the opposite of case 6 to get hires graphics
+		return make_reg(0, !isWindows);
+	case kPlatformIsHiRes:
+		return make_reg(0, isWindows);
+	case kPlatformIsItWindows:
+		return make_reg(0, isWindows);
+	default:
+		warning("Unsupported kPlatform operation %d", operation);
 	}
 	
 	return NULL_REG;


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