[Scummvm-cvs-logs] CVS: scummvm/dc dcmain.cpp,1.6,1.7 dc.h,1.3,1.4 selector.cpp,1.7,1.8

[Marcus Comstedt]

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

Modified Files:
	dcmain.cpp dc.h selector.cpp 
Log Message:
Now sets path to game with -p.

Index: dcmain.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/dc/dcmain.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** dcmain.cpp	16 Mar 2002 05:33:25 -0000	1.6
--- dcmain.cpp	16 Mar 2002 18:13:30 -0000	1.7
***************
*** 42,46 ****
  void cd_stop() {;}
  int cd_is_running() {return 0;}
- void cd_playtrack(int track, int offset, int delay) {
  
  void launcherLoop() {
--- 42,45 ----
***************
*** 78,83 ****
  }
  
! static char *argv[] = { "scummvm", NULL, NULL };
! static int argc = 2;
  
  int main()
--- 77,82 ----
  }
  
! static char *argv[] = { "scummvm", NULL, NULL, NULL };
! static int argc = 3;
  
  int main()
***************
*** 99,103 ****
    initSound();
  
!   if(!selectGame(&scumm, argv[1], icon))
      exit(0);
  
--- 98,102 ----
    initSound();
  
!   if(!selectGame(&scumm, argv[2], argv[1], icon))
      exit(0);
  

Index: dc.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/dc/dc.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dc.h	18 Feb 2002 19:56:50 -0000	1.3
--- dc.h	16 Mar 2002 18:13:30 -0000	1.4
***************
*** 5,8 ****
  			byte &leftBtnPressed, byte &rightBtnPressed,
  			int &keyPressed);
! extern bool selectGame(Scumm *s, char *&, class Icon &);
  
--- 5,8 ----
  			byte &leftBtnPressed, byte &rightBtnPressed,
  			int &keyPressed);
! extern bool selectGame(Scumm *s, char *&, char *&, class Icon &);
  

Index: selector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/dc/selector.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** selector.cpp	27 Feb 2002 18:32:53 -0000	1.7
--- selector.cpp	16 Mar 2002 18:13:30 -0000	1.8
***************
*** 235,242 ****
  		  break;
  	      if(i>=0) {
- 		games[curr_game].dir[strlen(games[curr_game].dir)-1]='\0';
  		strcpy(games[curr_game].filename_base,
  		       games[curr_game].dir+i+1);
  		games[curr_game].dir[i+1]='\0';
  	      }
  	    }
--- 235,245 ----
  		  break;
  	      if(i>=0) {
  		strcpy(games[curr_game].filename_base,
  		       games[curr_game].dir+i+1);
+ 		games[curr_game].filename_base[strlen(games[curr_game].
+ 						      filename_base)-1]='\0';
+ #if 0
  		games[curr_game].dir[i+1]='\0';
+ #endif
  	      }
  	    }
***************
*** 413,417 ****
  }
  
! bool selectGame(Scumm *s, char *&ret, Icon &icon)
  {
    Game *games = new Game[MAX_GAMES];
--- 416,420 ----
  }
  
! bool selectGame(Scumm *s, char *&ret, char *&dir_ret, Icon &icon)
  {
    Game *games = new Game[MAX_GAMES];
***************
*** 450,457 ****
  
    if(selected>=0) {
! #if 1
      chdir(the_game.dir);
  #else
      chdir("/");
  #endif
      ret = the_game.filename_base;
--- 453,463 ----
  
    if(selected>=0) {
! #if 0
      chdir(the_game.dir);
  #else
      chdir("/");
+     static char dirarg[258];
+     sprintf(dirarg, "-p%s", the_game.dir);
+     dir_ret = dirarg;
  #endif
      ret = the_game.filename_base;