[Scummvm-cvs-logs] CVS: scummvm scummvm.cpp,1.67,1.68

Mutwin Kraus mutle at users.sourceforge.net
Fri Mar 8 09:09:15 CET 2002


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

Modified Files:
	scummvm.cpp 
Log Message:
Some changes, need to be done to get the Mac Port running. For example Point is now called ScummPoint, as the name Point is already in use by Apple.

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** scummvm.cpp	8 Mar 2002 08:42:11 -0000	1.67
--- scummvm.cpp	8 Mar 2002 17:05:04 -0000	1.68
***************
*** 421,424 ****
--- 421,425 ----
  
  void Scumm::parseCommandLine(int argc, char **argv) {
+ 	#if !defined(__APPLE__CW)
  	int i;
  	char *s;
***************
*** 502,505 ****
--- 503,512 ----
  		}
  	}
+ 	#else
+ 	
+ 	//sprintf(_gameDataPath, ":%s:", *argv);
+ 	//_gameDataPath = *argv;
+ 	_exe_name = *argv;
+ 	#endif
  
  }
***************
*** 550,554 ****
          /* 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 */
--- 557,561 ----
          /* 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 */
***************
*** 1227,1230 ****
--- 1234,1238 ----
  
  void CDECL warning(const char *s, ...) {
+ #if 0
  	char buf[1024];
  	va_list va;
***************
*** 1235,1241 ****
--- 1243,1251 ----
  
  	fprintf(stderr, "WARNING: %s!\n", buf);
+ #endif
  }
  
  void CDECL debug(int level, const char *s, ...) {
+ #if 0
  	char buf[1024];
  	va_list va;
***************
*** 1249,1252 ****
--- 1259,1263 ----
  	printf("%s\n", buf);
  	fflush(stdout);
+ #endif
  }
  





More information about the Scummvm-git-logs mailing list