aboutsummaryrefslogtreecommitdiff
path: root/simon/simon.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'simon/simon.cpp')
-rw-r--r--simon/simon.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp
index c490b6b1c7..b7e7dc3f77 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -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 @@ void SimonState::o_pathfind(int x,int y,uint var_1,uint var_2) {
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;