[Scummvm-cvs-logs] CVS: scummvm/simon midi.cpp,1.8,1.9 simon.cpp,1.25,1.26 simon.h,1.15,1.16 simonsys.cpp,1.6,1.7

[Drigo Zoxx]

Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv23098

Modified Files:
	midi.cpp simon.cpp simon.h simonsys.cpp 
Log Message:
Fixed some things to support MacOS port

Index: midi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- midi.cpp	19 Apr 2002 11:12:27 -0000	1.8
+++ midi.cpp	5 May 2002 19:01:36 -0000	1.9
@@ -23,8 +23,13 @@
 #include "stdafx.h"
 #include "scummsys.h"
 #include "system.h"
+#ifndef macintosh
 #include "../sound/mididrv.h"
 #include "../sound/mixer.h"
+#else
+#include "mididrv.h"
+#include "mixer.h"
+#endif
 #include "simon.h"
 
 void MidiPlayer::read_from_file(void *dst, uint size) {

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- simon.cpp	5 May 2002 18:10:29 -0000	1.25
+++ simon.cpp	5 May 2002 19:01:36 -0000	1.26
@@ -23,7 +23,11 @@
 #include "stdafx.h"
 #include "scummsys.h"
 #include "system.h"
+#ifndef macintosh
 #include "../sound/mixer.h"
+#else
+#include "mixer.h"
+#endif
 #include "simon.h"
 
 
@@ -34,7 +38,11 @@
 #ifdef WIN32
 #include <malloc.h>
 #endif
+#ifndef macintosh
 #include <sys/stat.h>
+#else
+#include <stat.h>
+#endif
 
 int sdl_mouse_x, sdl_mouse_y;
 
@@ -6529,8 +6537,8 @@
 		if (!p)
 			continue;
 		for(j=0; READ_BE_UINT16_UNALIGNED(&p[0]) != 999; j++,p+=2) { /* 0xE703 = byteswapped 999 */
-			x_diff = abs((int)(READ_BE_UINT16_UNALIGNED(&p[0]) - x));
-			y_diff = abs((int)(READ_BE_UINT16_UNALIGNED(&p[1]) - 12 - y));
+			x_diff = abs((int) (READ_BE_UINT16_UNALIGNED(&p[0]) - x));
+			y_diff = abs((int) (READ_BE_UINT16_UNALIGNED(&p[1]) - 12 - y));
 
 			if (x_diff < y_diff) {
 				x_diff >>= 2;

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- simon.h	5 May 2002 18:10:45 -0000	1.15
+++ simon.h	5 May 2002 19:01:37 -0000	1.16
@@ -220,7 +220,7 @@
 };
 
 /* dummy typedefs to make it compile in *nix */
-#if defined(UNIX) || defined(UNIX_X11) || defined(__MORPHOS__) || defined(__DC__) || defined(__APPLE__CW)
+#if defined(UNIX) || defined(UNIX_X11) || defined(__MORPHOS__) || defined(__DC__) || defined(macintosh)
 typedef void* HMIDISTRM;
 typedef void* HMIDIOUT;
 typedef uint32 UINT;

Index: simonsys.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simonsys.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- simonsys.cpp	19 Apr 2002 11:12:27 -0000	1.6
+++ simonsys.cpp	5 May 2002 19:01:37 -0000	1.7
@@ -23,7 +23,11 @@
 #include "stdafx.h"
 #include "scummsys.h"
 #include "system.h"
+#ifndef macintosh
 #include "../sound/mixer.h"
+#else
+#include "mixer.h"
+#endif
 #include "simon.h"
 
 #include <stdarg.h>