[Scummvm-cvs-logs] SF.net SVN: scummvm: [25668] scummvm/trunk/engines/scumm/player_nes.cpp

[fingolfin at users.sourceforge.net]

Revision: 25668
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25668&view=rev
Author:   fingolfin
Date:     2007-02-17 17:05:27 -0800 (Sat, 17 Feb 2007)

Log Message:
-----------
cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/player_nes.cpp

Modified: scummvm/trunk/engines/scumm/player_nes.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_nes.cpp	2007-02-17 23:02:25 UTC (rev 25667)
+++ scummvm/trunk/engines/scumm/player_nes.cpp	2007-02-18 01:05:27 UTC (rev 25668)
@@ -176,7 +176,8 @@
 		break;
 
 	case 4:
-		if (!(Enabled = Val ? true : false))
+		Enabled = Val;
+		if (!Enabled)
 			Timer = 0;
 		break;
 	}
@@ -293,7 +294,8 @@
 		break;
 
 	case 4:
-		if (!(Enabled = Val ? true : false))
+		Enabled = Val;
+		if (!Enabled)
 			Timer = 0;
 		break;
 	}
@@ -389,7 +391,8 @@
 		break;
 
 	case 4:
-		if (!(Enabled = Val ? true : false))
+		Enabled = Val;
+		if (!Enabled)
 			Timer = 0;
 		break;
 	}
@@ -533,18 +536,14 @@
 			if (frame_Num < 4) {
 				obj.QuarterFrame();
 		
-				if (!(frame_Num & 1)) {
+				if (frame_Num & 1)
+					frame_Cycles++;
+				else
 					obj.HalfFrame();
-				}
-			}
-		
-			if (frame_Num & 1)
-				frame_Cycles++;
-		
-			if (frame_Num == 4)
-				frame_Num = 0;
-			else
+
 				frame_Num++;
+			} else
+				frame_Num = 0;
 		}
 	
 		if (!obj.Cycles)
@@ -571,14 +570,13 @@
 	while (tmp >= Frame.Cycles) {
 		tmp -= Frame.Cycles;
 		Frame.Cycles = 7457;
-	
-		if (Frame.Num & 1)
-			Frame.Cycles++;
-	
-		if (Frame.Num == 4)
-			Frame.Num = 0;
-		else
+
+		if (Frame.Num < 4) {
+			if (Frame.Num & 1)
+				Frame.Cycles++;
 			Frame.Num++;
+		} else
+			Frame.Num = 0;
 	}
 
 	Frame.Cycles -= tmp;


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