diff options
| author | Fabio Battaglia | 2010-02-04 20:17:03 +0000 |
|---|---|---|
| committer | Fabio Battaglia | 2010-02-04 20:17:03 +0000 |
| commit | 822e59288f34c03e468de2111d40467e419194c4 (patch) | |
| tree | d88038206de5b5ede372c793ec194117b9de026e | |
| parent | fb494493225cb490f4ed173774208b377e35c692 (diff) | |
| download | scummvm-rg350-822e59288f34c03e468de2111d40467e419194c4.tar.gz scummvm-rg350-822e59288f34c03e468de2111d40467e419194c4.tar.bz2 scummvm-rg350-822e59288f34c03e468de2111d40467e419194c4.zip | |
N64: remove some unused code
svn-id: r47886
| -rw-r--r-- | backends/platform/n64/Makefile | 1 | ||||
| -rw-r--r-- | backends/platform/n64/osys_n64_base.cpp | 9 |
2 files changed, 3 insertions, 7 deletions
diff --git a/backends/platform/n64/Makefile b/backends/platform/n64/Makefile index 562c704eb0..8de2634a82 100644 --- a/backends/platform/n64/Makefile +++ b/backends/platform/n64/Makefile @@ -18,7 +18,6 @@ DEFINES += -D__N64__ -DLIMIT_FPS -DNONSTANDARD_PORT -DDISABLE_DEFAULT_SAVEFILEMA LIBS += -lpakfs -lframfs -ln64 -ln64utils -lromfs #DEFINES += -D_ENABLE_DEBUG_ -#DEFINES += -D_NORMAL_N64_DELAY_ USE_LIBMAD=0 USE_LIBOGG=0 diff --git a/backends/platform/n64/osys_n64_base.cpp b/backends/platform/n64/osys_n64_base.cpp index ce82cf5a09..2ee99d2ddc 100644 --- a/backends/platform/n64/osys_n64_base.cpp +++ b/backends/platform/n64/osys_n64_base.cpp @@ -795,7 +795,6 @@ uint32 OSystem_N64::getMillis() { } 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 @@ void OSystem_N64::delayMillis(uint msecs) { 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 |