[Scummvm-cvs-logs] CVS: scummvm gameDetector.cpp,1.1,1.2 gameDetector.h,1.1,1.2 sdl.cpp,1.61,1.62
James Brown
ender at users.sourceforge.net
Mon Mar 25 00:52:05 CET 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv16528
Modified Files:
gameDetector.cpp gameDetector.h sdl.cpp
Log Message:
Finish gameDetector renaming.
Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gameDetector.cpp 25 Mar 2002 08:46:24 -0000 1.1
--- gameDetector.cpp 25 Mar 2002 08:51:34 -0000 1.2
***************
*** 1,2 ****
--- 1,25 ----
+ /* ScummVM - Scumm Interpreter
+ * Copyright (C) 2001 Ludvig Strigeus
+ * Copyright (C) 2001/2002 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * $Header$
+ *
+ */
+
+
#include "stdafx.h"
#include "scumm.h"
***************
*** 21,25 ****
"\tg - graphics mode. 1 for 2xSai anti-aliasing\n"
! void GameDetecter::parseCommandLine(int argc, char **argv) {
#if !defined(__APPLE__CW)
int i;
--- 44,48 ----
"\tg - graphics mode. 1 for 2xSai anti-aliasing\n"
! void GameDetector::parseCommandLine(int argc, char **argv) {
#if !defined(__APPLE__CW)
int i;
***************
*** 177,188 ****
/* Scumm Version 7 */
{"ft", "Full Throttle", GID_FT, 7, 3, 0, GF_NEW_OPCODES|GF_AFTER_V6|GF_AFTER_V7},
! {"dig", "The Dig", GID_DIG, 7, 5, 0, GF_NEW_OPCODES|GF_AFTER_V6|GF_AFTER_V7},
! /* Scumm Version 8 */
! // {"curse", "The Curse of Monkey Island", GID_CMI, 8, 1, 0,},
{NULL,NULL}
};
! bool GameDetecter::detectGame() {
const VersionSettings *gnl = version_settings;
--- 200,211 ----
/* Scumm Version 7 */
{"ft", "Full Throttle", GID_FT, 7, 3, 0, GF_NEW_OPCODES|GF_AFTER_V6|GF_AFTER_V7},
! {"dig", "The Dig", GID_DIG, 7, 5, 0, GF_NEW_OPCODES|GF_AFTER_V6|GF_AFTER_V7},
! /* Scumm Version 8 */
! // {"curse", "The Curse of Monkey Island", GID_CMI, 8, 1, 0,},
{NULL,NULL}
};
! bool GameDetector::detectGame() {
const VersionSettings *gnl = version_settings;
***************
*** 192,199 ****
if (!scumm_stricmp(_exe_name, gnl->filename)) {
_gameId = gnl->id;
! _scummVersion = gnl->major;
! // _majorScummVersion = gnl->major;
! // _middleScummVersion = gnl->middle;
! // _minorScummVersion = gnl->minor;
_features = gnl->features;
_gameText = gnl->gamename;
--- 215,220 ----
if (!scumm_stricmp(_exe_name, gnl->filename)) {
_gameId = gnl->id;
! _scummVersion = gnl->major;
!
_features = gnl->features;
_gameText = gnl->gamename;
***************
*** 209,213 ****
}
! char *GameDetecter::getGameName() {
if (_gameText==NULL) {
char buf[256];
--- 230,234 ----
}
! char *GameDetector::getGameName() {
if (_gameText==NULL) {
char buf[256];
***************
*** 218,227 ****
}
! int GameDetecter::detectMain(int argc, char **argv)
{
! _debugMode = 0; // off by default...
! _noSubtitles = 0; // use by default - should this depend on soundtrack?
! _scale = 2; // double size by default
_gameDataPath = NULL;
--- 239,248 ----
}
! int GameDetector::detectMain(int argc, char **argv)
{
! _debugMode = 0; // off by default...
! _noSubtitles = 0; // use by default - should this depend on soundtrack?
! _scale = 2; // double size by default
_gameDataPath = NULL;
Index: gameDetector.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gameDetector.h 25 Mar 2002 08:46:24 -0000 1.1
--- gameDetector.h 25 Mar 2002 08:51:34 -0000 1.2
***************
*** 1,3 ****
! class GameDetecter {
public:
int detectMain(int argc, char **argv);
--- 1,25 ----
! /* ScummVM - Scumm Interpreter
! * Copyright (C) 2001 Ludvig Strigeus
! * Copyright (C) 2001/2002 The ScummVM project
! *
! * This program is free software; you can redistribute it and/or
! * modify it under the terms of the GNU General Public License
! * as published by the Free Software Foundation; either version 2
! * of the License, or (at your option) any later version.
!
! * This program is distributed in the hope that it will be useful,
! * but WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! * GNU General Public License for more details.
!
! * You should have received a copy of the GNU General Public License
! * along with this program; if not, write to the Free Software
! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
! *
! * $Header$
! *
! */
!
! class GameDetector {
public:
int detectMain(int argc, char **argv);
Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** sdl.cpp 25 Mar 2002 08:46:24 -0000 1.61
--- sdl.cpp 25 Mar 2002 08:51:34 -0000 1.62
***************
*** 37,41 ****
Gui gui;
OSystem _system;
! GameDetecter detecter;
SoundEngine sound;
--- 37,41 ----
Gui gui;
OSystem _system;
! GameDetector detector;
SoundEngine sound;
***************
*** 790,794 ****
char buf[512], *gameName;
! sprintf(buf, "ScummVM - %s", gameName = detecter.getGameName());
free(gameName);
--- 790,794 ----
char buf[512], *gameName;
! sprintf(buf, "ScummVM - %s", gameName = detector.getGameName());
free(gameName);
***************
*** 852,856 ****
char buf[512], *gameName;
! sprintf(buf, "ScummVM - %s", gameName = detecter.getGameName());
free(gameName);
SDL_WM_SetCaption(buf,buf);
--- 852,856 ----
char buf[512], *gameName;
! sprintf(buf, "ScummVM - %s", gameName = detector.getGameName());
free(gameName);
SDL_WM_SetCaption(buf,buf);
***************
*** 923,939 ****
! if(detecter.detectMain(argc, argv))
return(-1);
! if(detecter._features & GF_OLD256)
scumm = new Scumm_v3;
else
! if(detecter._features & GF_SMALL_HEADER) // this force loomCD as v4
scumm = new Scumm_v4;
else
! if(detecter._features & GF_AFTER_V7)
scumm = new Scumm_v7;
else
! if(detecter._features & GF_AFTER_V6) // this force SamnmaxCD as v6
scumm = new Scumm_v6;
else
--- 923,939 ----
! if(detector.detectMain(argc, argv))
return(-1);
! if(detector._features & GF_OLD256)
scumm = new Scumm_v3;
else
! if(detector._features & GF_SMALL_HEADER) // this force loomCD as v4
scumm = new Scumm_v4;
else
! if(detector._features & GF_AFTER_V7)
scumm = new Scumm_v7;
else
! if(detector._features & GF_AFTER_V6) // this force SamnmaxCD as v6
scumm = new Scumm_v6;
else
***************
*** 1074,1090 ****
/* */
! scumm->_fullScreen = detecter._fullScreen;
! scumm->_debugMode = detecter._debugMode;
! scumm->_bootParam = detecter._bootParam;
! scumm->_scale = detecter._scale;
! scumm->_gameDataPath = detecter._gameDataPath;
! scumm->_gameTempo = detecter._gameTempo;
! scumm->_soundEngine = detecter._soundEngine;
! scumm->_videoMode = detecter._videoMode;
! scumm->_exe_name = detecter._exe_name;
! scumm->_gameId = detecter._gameId;
! scumm->_gameText = detecter._gameText;
! scumm->_features = detecter._features;
! scumm->_soundCardType = detecter._soundCardType;
--- 1074,1090 ----
/* */
! scumm->_fullScreen = detector._fullScreen;
! scumm->_debugMode = detector._debugMode;
! scumm->_bootParam = detector._bootParam;
! scumm->_scale = detector._scale;
! scumm->_gameDataPath = detector._gameDataPath;
! scumm->_gameTempo = detector._gameTempo;
! scumm->_soundEngine = detector._soundEngine;
! scumm->_videoMode = detector._videoMode;
! scumm->_exe_name = detector._exe_name;
! scumm->_gameId = detector._gameId;
! scumm->_gameText = detector._gameText;
! scumm->_features = detector._features;
! scumm->_soundCardType = detector._soundCardType;
More information about the Scummvm-git-logs
mailing list