[Scummvm-cvs-logs] SF.net SVN: scummvm:[47886] scummvm/trunk/backends/platform/n64

[Hkz at users.sourceforge.net]

Revision: 47886
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47886&view=rev
Author:   Hkz
Date:     2010-02-04 20:17:03 +0000 (Thu, 04 Feb 2010)

Log Message:
-----------
N64: remove some unused code

Modified Paths:
--------------
    scummvm/trunk/backends/platform/n64/Makefile
    scummvm/trunk/backends/platform/n64/osys_n64_base.cpp

Modified: scummvm/trunk/backends/platform/n64/Makefile
===================================================================
--- scummvm/trunk/backends/platform/n64/Makefile	2010-02-04 20:02:48 UTC (rev 47885)
+++ scummvm/trunk/backends/platform/n64/Makefile	2010-02-04 20:17:03 UTC (rev 47886)
@@ -18,7 +18,6 @@
 LIBS += -lpakfs -lframfs -ln64 -ln64utils -lromfs 
 
 #DEFINES += -D_ENABLE_DEBUG_
-#DEFINES += -D_NORMAL_N64_DELAY_
 
 USE_LIBMAD=0
 USE_LIBOGG=0

Modified: scummvm/trunk/backends/platform/n64/osys_n64_base.cpp
===================================================================
--- scummvm/trunk/backends/platform/n64/osys_n64_base.cpp	2010-02-04 20:02:48 UTC (rev 47885)
+++ scummvm/trunk/backends/platform/n64/osys_n64_base.cpp	2010-02-04 20:17:03 UTC (rev 47886)
@@ -795,7 +795,6 @@
 }
 
 void OSystem_N64::delayMillis(uint msecs) {
-#ifndef _NORMAL_N64_DELAY_
 	// In some cases a game might hang waiting for audio being
 	// played. This is a workaround for all the situations i
 	// found (kyra 1 & 2 DOS).
@@ -804,13 +803,11 @@
 	refillAudioBuffers();
 	uint32 pastMillis = (getMilliTick() - oldTime);
 
-	if (pastMillis >= msecs)
+	if (pastMillis >= msecs) {
 		return;
-	else
+	} else {
 		delay(msecs - pastMillis);
-#else
-	delay(msecs);
-#endif
+	}
 }
 
 // As we don't have multi-threading, no need for mutexes


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