thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed some things to support MacOS port

Browse source 
svn-id: r4210
This commit is contained in:
Enrico Rolfi 2002-05-05 19:01:37 +00:00
parent 5d3f7e2de6
commit bdcb76fe3b
4 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
simon/midi.cpp
View file

@ -23,8 +23,13 @@
#include "stdafx.h" #include "stdafx.h"
#include "scummsys.h" #include "scummsys.h"
#include "system.h" #include "system.h"
#ifndef macintosh
#include "../sound/mididrv.h" #include "../sound/mididrv.h"
#include "../sound/mixer.h" #include "../sound/mixer.h"
#else
#include "mididrv.h"
#include "mixer.h"
#endif
#include "simon.h" #include "simon.h"
void MidiPlayer::read_from_file(void *dst, uint size) { void MidiPlayer::read_from_file(void *dst, uint size) {

12
simon/simon.cpp
View file

@ -23,7 +23,11 @@
#include "stdafx.h" #include "stdafx.h"
#include "scummsys.h" #include "scummsys.h"
#include "system.h" #include "system.h"
#ifndef macintosh
#include "../sound/mixer.h" #include "../sound/mixer.h"
#else
#include "mixer.h"
#endif
#include "simon.h" #include "simon.h"
@ -34,7 +38,11 @@
#ifdef WIN32 #ifdef WIN32
#include <malloc.h> #include <malloc.h>
#endif #endif
#ifndef macintosh
#include <sys/stat.h> #include <sys/stat.h>
#else
#include <stat.h>
#endif
int sdl_mouse_x, sdl_mouse_y; 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) if (!p)
continue; continue;
for(j=0; READ_BE_UINT16_UNALIGNED(&p[0]) != 999; j++,p+=2) { /* 0xE703 = byteswapped 999 */ 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)); x_diff = abs((int) (READ_BE_UINT16_UNALIGNED(&p[0]) - x));
y_diff = abs((int)(READ_BE_UINT16_UNALIGNED(&p[1]) - 12 - y)); y_diff = abs((int) (READ_BE_UINT16_UNALIGNED(&p[1]) - 12 - y));
if (x_diff < y_diff) { if (x_diff < y_diff) {
x_diff >>= 2; x_diff >>= 2;

2
simon/simon.h
View file

@ -220,7 +220,7 @@ struct VgaFile1Struct0x6 {
}; };
/* dummy typedefs to make it compile in *nix */ /* 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* HMIDISTRM;
typedef void* HMIDIOUT; typedef void* HMIDIOUT;
typedef uint32 UINT; typedef uint32 UINT;

4
simon/simonsys.cpp
View file

@ -23,7 +23,11 @@
#include "stdafx.h" #include "stdafx.h"
#include "scummsys.h" #include "scummsys.h"
#include "system.h" #include "system.h"
#ifndef macintosh
#include "../sound/mixer.h" #include "../sound/mixer.h"
#else
#include "mixer.h"
#endif
#include "simon.h" #include "simon.h"
#include <stdarg.h> #include <stdarg.h>