[Scummvm-cvs-logs] CVS: scummvm gameDetector.cpp,1.16,1.17 system.h,1.10,1.11
Ruediger Hanke
tomjoad at users.sourceforge.net
Tue Apr 16 13:29:08 CEST 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv7755
Modified Files:
gameDetector.cpp system.h
Log Message:
MorphOS CD audio reenableeSystem()
Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** gameDetector.cpp 16 Apr 2002 15:49:21 -0000 1.16
--- gameDetector.cpp 16 Apr 2002 20:28:55 -0000 1.17
***************
*** 388,396 ****
--- 388,401 ----
OSystem *GameDetector::createSystem() {
+ #ifdef __MORPHOS__
+ _gfx_driver = GD_MORPHOS;
+ #endif
/* auto is to use SDL */
switch(_gfx_driver) {
case GD_SDL:
case GD_AUTO:
+ #if !defined(__MORPHOS__)
return OSystem_SDL_create(_gfx_mode, _fullScreen);
+ #endif
case GD_WIN32:
/* not implemented yet */
***************
*** 401,404 ****
--- 406,415 ----
break;
+ case GD_MORPHOS:
+ #if defined(__MORPHOS__)
+ return OSystem_MorphOS_create(_gameId, _gfx_mode, _fullScreen);
+ #endif
+ break;
+
case GD_NULL:
return OSystem_NULL_create();
***************
*** 427,429 ****
error("Invalid midi driver selected");
return NULL;
! }
\ No newline at end of file
--- 438,440 ----
error("Invalid midi driver selected");
return NULL;
! }
Index: system.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/system.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** system.h 16 Apr 2002 16:11:08 -0000 1.10
--- system.h 16 Apr 2002 20:28:55 -0000 1.11
***************
*** 139,142 ****
--- 139,143 ----
GD_X = 3,
GD_NULL = 4,
+ GD_MORPHOS = 5,
};
More information about the Scummvm-git-logs
mailing list