[Scummvm-cvs-logs] SF.net SVN: scummvm: [28772] scummvm/trunk/engines/saga/ihnm_introproc.cpp

[sev at users.sourceforge.net]

Revision: 28772
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28772&view=rev
Author:   sev
Date:     2007-08-31 04:14:32 -0700 (Fri, 31 Aug 2007)

Log Message:
-----------
Simplify fading code a bit.

Modified Paths:
--------------
    scummvm/trunk/engines/saga/ihnm_introproc.cpp

Modified: scummvm/trunk/engines/saga/ihnm_introproc.cpp
===================================================================
--- scummvm/trunk/engines/saga/ihnm_introproc.cpp	2007-08-31 10:59:33 UTC (rev 28771)
+++ scummvm/trunk/engines/saga/ihnm_introproc.cpp	2007-08-31 11:14:32 UTC (rev 28772)
@@ -181,13 +181,14 @@
 		switch (phase) {
 		case 0: // fadeout
 		case 1: // fadeout 100%
+		case 7: // fadeout
+		case 8: // fadeout 100%
+			_vm->_gfx->palToBlack(cur_pal, (double)(curTime - startTime) / kNormalFadeDuration);
+			// fall through
+
 		case 3: // fadein
 		case 4: // fadein 100%
-		case 7: // fadeout
-		case 8: // fadeout 100%
-			if (phase == 0 || phase == 1 || phase == 7 || phase == 8)
-				_vm->_gfx->palToBlack(cur_pal, (double)(curTime - startTime) / kNormalFadeDuration);
-			else
+			if (phase == 3 || phase == 4)
 				_vm->_gfx->blackToPal(pal_cut, (double)(curTime - startTime) / kNormalFadeDuration);
 
 			if (curTime - startTime > kNormalFadeDuration) {


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