[Scummvm-cvs-logs] CVS: scummvm gameDetecter.cpp,1.1,1.2 gameDetecter.h,1.1,1.2 sdl.cpp,1.57,1.58

Vincent Hamm yazoo at users.sourceforge.net
Sun Mar 24 16:46:02 CET 2002


Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv25333

Modified Files:
	gameDetecter.cpp gameDetecter.h sdl.cpp 
Log Message:
Fixed a few things in the launcher

Index: gameDetecter.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetecter.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gameDetecter.cpp	23 Mar 2002 20:34:45 -0000	1.1
--- gameDetecter.cpp	25 Mar 2002 00:45:07 -0000	1.2
***************
*** 217,221 ****
  }
  
! void GameDetecter::detectMain(int argc, char **argv)
  {
          _debugMode = 0;  // off by default...
--- 217,221 ----
  }
  
! int GameDetecter::detectMain(int argc, char **argv)
  {
          _debugMode = 0;  // off by default...
***************
*** 234,261 ****
                  _midi_driver = MIDI_NULL;
          #endif
  	parseCommandLine(argc, argv);
  
!         if (_exe_name != NULL) {
!           /* No game selection menu */
          if (!detectGame()) {
              warning("Game detection failed. Using default settings");
              _features = GF_DEFAULT;
- 	              }
          } else {
            _gameText = "Please choose a game";
          }
  
-         /* Init graphics and create a primary virtual screen */
- 
-         if (_exe_name==NULL) {
- 		//launcherLoop();
- 		//setWindowName(this);
-         }
- 
-         if (!detectGame()) {
-                 warning("Game detection failed. Using default settings");
-                 _features = GF_DEFAULT;
-         }
- 
          if (!_gameDataPath) {
                  warning("No path was provided. Assuming that data file are in the current directory");
--- 234,255 ----
                  _midi_driver = MIDI_NULL;
          #endif
+ 		
  	parseCommandLine(argc, argv);
  
! 	if (_exe_name==NULL) {
! 		//launcherLoop();
! 		//setWindowName(this);
! 		warning("No game was specified...");
! 		return(-1);
! 	}
! 
! 	
          if (!detectGame()) {
              warning("Game detection failed. Using default settings");
              _features = GF_DEFAULT;
          } else {
            _gameText = "Please choose a game";
          }
  
          if (!_gameDataPath) {
                  warning("No path was provided. Assuming that data file are in the current directory");
***************
*** 263,266 ****
--- 257,262 ----
                  strcpy(_gameDataPath, "");
          }
+ 
+ 	return(0);
  }
  

Index: gameDetecter.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetecter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gameDetecter.h	23 Mar 2002 20:34:45 -0000	1.1
--- gameDetecter.h	25 Mar 2002 00:45:08 -0000	1.2
***************
*** 1,5 ****
  class GameDetecter {
  public:
! 	void detectMain(int argc, char **argv);
  	void parseCommandLine(int argc, char **argv);
  	bool detectGame(void);
--- 1,5 ----
  class GameDetecter {
  public:
! 	int detectMain(int argc, char **argv);
  	void parseCommandLine(int argc, char **argv);
  	bool detectGame(void);

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** sdl.cpp	24 Mar 2002 17:49:46 -0000	1.57
--- sdl.cpp	25 Mar 2002 00:45:09 -0000	1.58
***************
*** 923,927 ****
  
  
! 	detecter.detectMain(argc, argv);
  
  	if( detecter._features & GF_AFTER_V7 ) // not final implementation. This is just a test
--- 923,928 ----
  
  
! 	if(detecter.detectMain(argc, argv))
! 		return(-1);
  
  	if( detecter._features & GF_AFTER_V7 ) // not final implementation. This is just a test





More information about the Scummvm-git-logs mailing list