aboutsummaryrefslogtreecommitdiff
path: root/scummvm.cpp
diff options
context:
space:
mode:
authorJames Brown2002-03-24 16:05:56 +0000
committerJames Brown2002-03-24 16:05:56 +0000
commitad70aad4ca161d74fb5b115f4bf137aaed795b8b (patch)
tree1e53659de70a4e54e9bc9dcda48a78e94353b7da /scummvm.cpp
parentf3de680c64f93770431d9d18bb9b82fe16c0e35b (diff)
downloadscummvm-rg350-ad70aad4ca161d74fb5b115f4bf137aaed795b8b.tar.gz
scummvm-rg350-ad70aad4ca161d74fb5b115f4bf137aaed795b8b.tar.bz2
scummvm-rg350-ad70aad4ca161d74fb5b115f4bf137aaed795b8b.zip
Make Visual Studio compile again.
svn-id: r3811
Diffstat (limited to 'scummvm.cpp')
-rw-r--r--scummvm.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/scummvm.cpp b/scummvm.cpp
index 3ea30e31f0..87ed4dcd56 100644
--- a/scummvm.cpp
+++ b/scummvm.cpp
@@ -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);