[Scummvm-cvs-logs] CVS: scummvm scummvm.cpp,1.95,1.96 scummvm.dsp,1.24,1.25

[James Brown]

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

Modified Files:
	scummvm.cpp scummvm.dsp 
Log Message:
Make Visual Studio compile again.



Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** scummvm.cpp	24 Mar 2002 00:44:28 -0000	1.95
--- scummvm.cpp	24 Mar 2002 16:05:56 -0000	1.96
***************
*** 951,955 ****
  }
  
! extern Scumm scumm;
  
  void NORETURN CDECL error(const char *s, ...) {
--- 951,955 ----
  }
  
! extern Scumm *scumm;
  
  void NORETURN CDECL error(const char *s, ...) {
***************
*** 961,970 ****
  	va_end(va);
  
! 	if (scumm._currentScript != 0xFF) {
! 		ScriptSlot *ss = &scumm.vm.slot[scumm._currentScript];
  		fprintf(stderr, "Error(%d:%d:0x%X): %s!\n",
! 			scumm._roomResource,
  			ss->number,
! 			scumm._scriptPointer - scumm._scriptOrgPointer,
  			buf);
  	} else {
--- 961,970 ----
  	va_end(va);
  
! 	if (scumm->_currentScript != 0xFF) {
! 		ScriptSlot *ss = &scumm->vm.slot[scumm->_currentScript];
  		fprintf(stderr, "Error(%d:%d:0x%X): %s!\n",
! 			scumm->_roomResource,
  			ss->number,
! 			scumm->_scriptPointer - scumm->_scriptOrgPointer,
  			buf);
  	} else {

Index: scummvm.dsp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.dsp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** scummvm.dsp	16 Mar 2002 05:39:14 -0000	1.24
--- scummvm.dsp	24 Mar 2002 16:05:56 -0000	1.25
***************
*** 44,49 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c
! # ADD CPP /nologo /G6 /MD /W3 /O2 /Ob2 /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
! # SUBTRACT CPP /YX /Yc /Yu
  # ADD BASE RSC /l 0x41d /d "NDEBUG"
  # ADD RSC /l 0x41d /d "NDEBUG"
--- 44,48 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c
! # ADD CPP /nologo /G6 /MD /W3 /O2 /Ob2 /I "." /I "Sound" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  # ADD BASE RSC /l 0x41d /d "NDEBUG"
  # ADD RSC /l 0x41d /d "NDEBUG"
***************
*** 192,195 ****
--- 191,198 ----
  # Begin Source File
  
+ SOURCE=.\gameDetecter.cpp
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=.\gfx.cpp
  
***************
*** 412,416 ****
--- 415,427 ----
  # Begin Source File
  
+ SOURCE=.\akos.h
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=.\sound\fmopl.h
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=.\gameDetecter.h
  # End Source File
  # Begin Source File