[Scummvm-cvs-logs] CVS: scummvm gameDetector.cpp,1.56,1.57 gui.cpp,1.40,1.41 main.cpp,1.18,1.19 saveload.cpp,1.44,1.45 script_v2.cpp,1.55,1.56 scumm.h,1.153,1.154 scummvm.cpp,1.137,1.138 sound.cpp,1.79,1.80 stdafx.h,1.15,1.16 system.h,1.18,1.19
Max Horn
fingolfin at users.sourceforge.net
Sun May 5 13:05:03 CEST 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv6388
Modified Files:
gameDetector.cpp gui.cpp main.cpp saveload.cpp script_v2.cpp
scumm.h scummvm.cpp sound.cpp stdafx.h system.h
Log Message:
cleaning up the mess drigo left... <sigh>
Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- gameDetector.cpp 5 May 2002 19:06:50 -0000 1.56
+++ gameDetector.cpp 5 May 2002 20:04:22 -0000 1.57
@@ -23,13 +23,8 @@
#include "stdafx.h"
#include "scumm.h"
-#ifndef macintosh
#include "sound/mididrv.h"
#include "sound/imuse.h"
-#else
-#include "mididrv.h"
-#include "imuse.h"
-#endif
#include "gameDetector.h"
@@ -473,6 +468,8 @@
_gfx_driver = GD_MORPHOS;
#elif defined(_WIN32_WCE)
_gfx_driver = GD_WINCE;
+#elif defined(MACOS_CARBON)
+ _gfx_driver = GD_MAC;
#else
/* SDL is the default driver for now */
_gfx_driver = GD_SDL;
@@ -542,6 +539,9 @@
#elif defined(__MORPHOS__)
case GD_MORPHOS:
return OSystem_MorphOS_create(_gameId, _gfx_mode, _fullScreen);
+#elif defined(MACOS_CARBON)
+ case GD_MAC:
+ return OSystem_MAC_create(_gfx_mode, _fullScreen);
#elif defined(USE_NULL_DRIVER)
case GD_NULL:
return OSystem_NULL_create();
Index: gui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- gui.cpp 5 May 2002 19:06:50 -0000 1.40
+++ gui.cpp 5 May 2002 20:04:24 -0000 1.41
@@ -21,13 +21,8 @@
#include "stdafx.h"
#include "scumm.h"
-#ifndef macintosh
#include "sound/mididrv.h"
#include "sound/imuse.h"
-#else
-#include "mididrv.h"
-#include "imuse.h"
-#endif
#include "gui.h"
#include "guimaps.h"
Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/main.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- main.cpp 5 May 2002 19:08:11 -0000 1.18
+++ main.cpp 5 May 2002 20:04:25 -0000 1.19
@@ -25,11 +25,7 @@
#include "mididrv.h"
#include "gameDetector.h"
#include "gui.h"
-#ifndef macintosh
#include "simon/simon.h"
-#else
-#include "simon.h"
-#endif
#include "config-file.h"
GameDetector detector;
@@ -98,8 +94,13 @@
int main(int argc, char *argv[])
{
+/*
+Disabled this for now. What good does it do, anyway, we now have real config
+files, and a proper port to MacOS classic should offer a dialog or so for any
+game settings!
+
#if defined(MACOS_SDL)
- /* support for config file for macos SDL port */
+ // support for config file for macos SDL port
char *argitem;
char *argstr;
@@ -131,6 +132,7 @@
fclose(argf);
#endif
+*/
#if defined(UNIX) || defined(UNIX_X11)
char scummhome[MAXPATHLEN];
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saveload.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- saveload.cpp 5 May 2002 19:06:50 -0000 1.44
+++ saveload.cpp 5 May 2002 20:04:25 -0000 1.45
@@ -22,13 +22,8 @@
#include "stdafx.h"
#include "scumm.h"
-#ifndef macintosh
#include "sound/mididrv.h"
#include "sound/imuse.h"
-#else
-#include "mididrv.h"
-#include "imuse.h"
-#endif
struct SaveGameHeader {
uint32 type;
@@ -163,7 +158,7 @@
#ifndef _WIN32_WCE
-#if !defined(macintosh)
+#if !defined(MACOS_CARBON)
const char *dir = getenv("SCUMMVM_SAVEPATH");
if (dir == NULL)
dir = "";
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v2.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- script_v2.cpp 5 May 2002 19:06:50 -0000 1.55
+++ script_v2.cpp 5 May 2002 20:04:25 -0000 1.56
@@ -24,13 +24,8 @@
#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()
{
@@ -2713,7 +2708,6 @@
break;
case 13:
remapActor(derefActorSafe(args[1], "o6_miscOps:14"), args[2], args[3],
-
args[4], -1);
break;
case 14:
@@ -2919,27 +2913,16 @@
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:
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- scumm.h 5 May 2002 19:06:50 -0000 1.153
+++ scumm.h 5 May 2002 20:04:25 -0000 1.154
@@ -21,11 +21,7 @@
#include "scummsys.h"
#include "system.h"
-#ifndef macintosh
#include "sound/mixer.h"
-#else
-#include "mixer.h"
-#endif
#include "config-file.h"
#define SCUMMVM_VERSION "0.2.0 devel"
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- scummvm.cpp 5 May 2002 19:06:50 -0000 1.137
+++ scummvm.cpp 5 May 2002 20:04:25 -0000 1.138
@@ -22,13 +22,8 @@
#include "stdafx.h"
#include "scumm.h"
-#ifndef macintosh
#include "sound/mididrv.h"
#include "sound/imuse.h"
-#else
-#include "mididrv.h"
-#include "imuse.h"
-#endif
#include "gui.h"
#include "string.h"
#include "gameDetector.h"
@@ -742,7 +737,7 @@
else
size = READ_BE_UINT32_UNALIGNED(ptr + 4);
-#if defined(macintosh)
+#if defined(MACOS_CARBON)
sprintf(buf, ":dumps:%s%d.dmp", tag, idx);
#else
sprintf(buf, "dumps/%s%d.dmp", tag, idx);
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- sound.cpp 5 May 2002 19:06:51 -0000 1.79
+++ sound.cpp 5 May 2002 20:04:25 -0000 1.80
@@ -22,15 +22,9 @@
#include "stdafx.h"
#include "scumm.h"
-#ifndef macintosh
#include "sound/mididrv.h"
#include "sound/imuse.h"
#include <sys/stat.h>
-#else
-#include "mididrv.h"
-#include "imuse.h"
-#include <stat.h>
-#endif
#ifdef _WIN32_WCE
extern void *bsearch(const void *, const void *, size_t,
Index: stdafx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/stdafx.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- stdafx.h 5 May 2002 19:06:51 -0000 1.15
+++ stdafx.h 5 May 2002 20:04:25 -0000 1.16
@@ -2,6 +2,9 @@
* $Id$
*
* $Log$
+ * Revision 1.16 2002/05/05 20:04:25 fingolfin
+ * cleaning up the mess drigo left... <sigh>
+ *
* Revision 1.15 2002/05/05 19:06:51 drigo
* Fixed some things for Macintosh ports
*
@@ -132,7 +135,8 @@
#define SCUMMVM_PLATFORM_VERSION "X11 version"
#else
-#ifdef macintosh
+
+#ifdef MACOS_CARBON
#define SCUMMVM_PLATFORM_VERSION "Macintosh version"
#else
Index: system.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/system.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- system.h 4 May 2002 09:55:10 -0000 1.18
+++ system.h 5 May 2002 20:04:25 -0000 1.19
@@ -145,12 +145,13 @@
*/
/* OSystem_SDL */
-OSystem *OSystem_SDL_create(int gfx_driver, bool full_screen);
-OSystem *OSystem_NULL_create();
-OSystem *OSystem_MorphOS_create(int game_id, int gfx_driver, bool full_screen);
-OSystem *OSystem_Dreamcast_create();
-OSystem *OSystem_WINCE3_create();
-OSystem *OSystem_X11_create();
+extern OSystem *OSystem_SDL_create(int gfx_driver, bool full_screen);
+extern OSystem *OSystem_NULL_create();
+extern OSystem *OSystem_MorphOS_create(int game_id, int gfx_driver, bool full_screen);
+extern OSystem *OSystem_Dreamcast_create();
+extern OSystem *OSystem_WINCE3_create();
+extern OSystem *OSystem_X11_create();
+extern OSystem *OSystem_MAC_create(int gfx_mode, bool full_screen);
enum {
GFX_NORMAL = 0,
@@ -170,5 +171,6 @@
GD_X,
GD_MORPHOS,
GD_WINCE,
+ GD_MAC,
GD_DC
};
More information about the Scummvm-git-logs
mailing list