aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sfx
diff options
context:
space:
mode:
authorMax Horn2009-02-18 19:14:40 +0000
committerMax Horn2009-02-18 19:14:40 +0000
commit766783b493b147076e434214a6aff6b3c2f8cd9b (patch)
treeca7d457035ef70e0bbe99abbfcb9310e06c8321b /engines/sci/sfx
parentc01b069b91c519b191f809d595e03967a04c118d (diff)
downloadscummvm-rg350-766783b493b147076e434214a6aff6b3c2f8cd9b.tar.gz
scummvm-rg350-766783b493b147076e434214a6aff6b3c2f8cd9b.tar.bz2
scummvm-rg350-766783b493b147076e434214a6aff6b3c2f8cd9b.zip
SCI: Some random cleanup
svn-id: r38497
Diffstat (limited to 'engines/sci/sfx')
-rw-r--r--engines/sci/sfx/player/polled.cpp13
1 files changed, 3 insertions, 10 deletions
diff --git a/engines/sci/sfx/player/polled.cpp b/engines/sci/sfx/player/polled.cpp
index 7b32c8bee8..4eacb63d48 100644
--- a/engines/sci/sfx/player/polled.cpp
+++ b/engines/sci/sfx/player/polled.cpp
@@ -29,9 +29,7 @@
#include "sci/sfx/softseq.h"
#include "sci/sfx/mixer.h"
-#ifndef _MSC_VER
-#include <unistd.h> // for close()
-#endif
+#include "common/file.h"
static song_iterator_t *play_it;
static int play_paused = 0;
@@ -167,20 +165,15 @@ pp_set_option(char *name, char *value) {
static int
pp_init(resource_mgr_t *resmgr, int expected_latency) {
resource_t *res = NULL, *res2 = NULL;
- int fd;
if (!mixer)
return SFX_ERROR;
/* FIXME Temporary hack to detect Amiga games. */
- fd = sci_open("bank.001", O_RDONLY);
-
- if (fd == SCI_INVALID_FD)
+ if (!Common::File::exists("bank.001"))
seq = sfx_find_softseq(NULL);
- else {
- close(fd);
+ else
seq = sfx_find_softseq("amiga");
- }
if (!seq) {
sciprintf("[sfx:seq:polled] Initialisation failed: Could not find software sequencer\n");