Make Visual Studio compile again.

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

View file

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