aboutsummaryrefslogtreecommitdiff
path: root/script_v2.cpp
diff options
context:
space:
mode:
authorEnrico Rolfi2002-05-05 19:06:51 +0000
committerEnrico Rolfi2002-05-05 19:06:51 +0000
commit38d048b86bd96796511a44b62b020ac6f6dfea3b (patch)
treeee3fd5d3eafd3d240eacbdea0af8a33c5fe83f48 /script_v2.cpp
parent00f35bec5a387a2bd4dc983372245edb8e4a7c8f (diff)
downloadscummvm-rg350-38d048b86bd96796511a44b62b020ac6f6dfea3b.tar.gz
scummvm-rg350-38d048b86bd96796511a44b62b020ac6f6dfea3b.tar.bz2
scummvm-rg350-38d048b86bd96796511a44b62b020ac6f6dfea3b.zip
Fixed some things for Macintosh ports
svn-id: r4212
Diffstat (limited to 'script_v2.cpp')
-rw-r--r--script_v2.cpp18
1 files changed, 17 insertions, 1 deletions
diff --git a/script_v2.cpp b/script_v2.cpp
index 1e839699ff..c7f2c87432 100644
--- a/script_v2.cpp
+++ b/script_v2.cpp
@@ -24,9 +24,13 @@
#include "stdafx.h"
#include "scumm.h"
+#ifndef macintosh
#include "sound/mididrv.h"
-
#include "sound/imuse.h"
+#else
+#include "mididrv.h"
+#include "imuse.h"
+#endif
void Scumm::setupOpcodes2()
{
@@ -2709,6 +2713,7 @@ void Scumm::o6_miscOps()
break;
case 13:
remapActor(derefActorSafe(args[1], "o6_miscOps:14"), args[2], args[3],
+
args[4], -1);
break;
case 14:
@@ -2914,16 +2919,27 @@ void Scumm::o6_kernelFunction()
break;
case 211:
warning("o6_kernelFunction: getInput(%d)", args[1]);
+
/*
+
13 = thrust
+
336 = thrust
+
328 = thrust
+
27 = abord
+
97 = left
+
331 = left
+
115 = right
+
333 = tight
+
*/
+
push(0);
break;
case 212: