thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make Visual Studio compile again.

Browse source 
svn-id: r3811
This commit is contained in:
James Brown 2002-03-24 16:05:56 +00:00
parent f3de680c64
commit ad70aad4ca
2 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scummvm.cpp
View file

@ -950,7 +950,7 @@ int Scumm::normalizeAngle(int angle) {
return (angle+360)%360; return (angle+360)%360;
} }
extern Scumm scumm; extern Scumm *scumm;
void NORETURN CDECL error(const char *s, ...) { void NORETURN CDECL error(const char *s, ...) {
char buf[1024]; char buf[1024];
@ -960,12 +960,12 @@ void NORETURN CDECL error(const char *s, ...) {
vsprintf(buf, s, va); vsprintf(buf, s, va);
va_end(va); va_end(va);
if (scumm._currentScript != 0xFF) { if (scumm->_currentScript != 0xFF) {
ScriptSlot *ss = &scumm.vm.slot[scumm._currentScript]; ScriptSlot *ss = &scumm->vm.slot[scumm->_currentScript];
fprintf(stderr, "Error(%d:%d:0x%X): %s!\n", fprintf(stderr, "Error(%d:%d:0x%X): %s!\n",
scumm._roomResource, scumm->_roomResource,
ss->number, ss->number,
scumm._scriptPointer - scumm._scriptOrgPointer, scumm->_scriptPointer - scumm->_scriptOrgPointer,
buf); buf);
} else { } else {
fprintf(stderr, "Error: %s!\n", buf); fprintf(stderr, "Error: %s!\n", buf);

15
scummvm.dsp
View file

@ -43,8 +43,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c # 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 # ADD CPP /nologo /G6 /MD /W3 /O2 /Ob2 /I "." /I "Sound" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX /Yc /Yu
# ADD BASE RSC /l 0x41d /d "NDEBUG" # ADD BASE RSC /l 0x41d /d "NDEBUG"
# ADD RSC /l 0x41d /d "NDEBUG" # ADD RSC /l 0x41d /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@ -191,6 +190,10 @@ SOURCE=.\debug.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\gameDetecter.cpp
# End Source File
# Begin Source File
SOURCE=.\gfx.cpp SOURCE=.\gfx.cpp
!IF "$(CFG)" == "scummvm - Win32 Release" !IF "$(CFG)" == "scummvm - Win32 Release"
@ -411,10 +414,18 @@ SOURCE=.\verbs.cpp
# PROP Default_Filter "h;hpp;hxx;hm;inl" # PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File # Begin Source File
SOURCE=.\akos.h
# End Source File
# Begin Source File
SOURCE=.\sound\fmopl.h SOURCE=.\sound\fmopl.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\gameDetecter.h
# End Source File
# Begin Source File
SOURCE=.\sound\gmidi.h SOURCE=.\sound\gmidi.h
# End Source File # End Source File
# Begin Source File # Begin Source File