diff options
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/dreamweb/dreambase.h | 3 | ||||
| -rw-r--r-- | engines/dreamweb/dreamweb.cpp | 3 | ||||
| -rw-r--r-- | engines/dreamweb/stubs.h | 1 | ||||
| -rw-r--r-- | engines/dreamweb/vgagrafx.cpp | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h index cea7dc2512..45dc3791e2 100644 --- a/engines/dreamweb/dreambase.h +++ b/engines/dreamweb/dreambase.h @@ -70,7 +70,8 @@ public: // from vgagrafx.cpp uint8 _workspace[(0x1000 + 2) * 16]; - uint8 *workspace() { return _workspace; } + inline uint8 *workspace() { return _workspace; } + void clearWork(); void printUnderMon(); void cls(); diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp index 4b93b597a1..df39c4dfd6 100644 --- a/engines/dreamweb/dreamweb.cpp +++ b/engines/dreamweb/dreamweb.cpp @@ -353,8 +353,7 @@ void DreamWebEngine::blit(const uint8 *src, int pitch, int x, int y, int w, int } void DreamWebEngine::printUnderMonitor() { - uint8 *workspace = _context.workspace(); - uint8 *dst = workspace + DreamGen::kScreenwidth * 43 + 76; + uint8 *dst = _base._workspace + DreamGen::kScreenwidth * 43 + 76; Graphics::Surface *s = _system->lockScreen(); if (!s) diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h index 88d6b071cc..ab669ed960 100644 --- a/engines/dreamweb/stubs.h +++ b/engines/dreamweb/stubs.h @@ -31,7 +31,6 @@ uint16 allocateMem(uint16 paragraphs); void deallocateMem(uint16 segment); uint8 *textUnder(); - void clearWork(); uint16 standardLoad(const char *fileName, uint16 *outSizeInBytes = NULL); // Returns a segment handle which needs to be freed with deallocatemem for symmetry void *standardLoadCPP(const char *fileName, uint16 *outSizeInBytes = NULL); // And this one should be 'free'd void loadIntoTemp(); diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp index 54c737d07f..c8280bdbbb 100644 --- a/engines/dreamweb/vgagrafx.cpp +++ b/engines/dreamweb/vgagrafx.cpp @@ -380,7 +380,7 @@ void DreamGenContext::showFrame() { ch = height; } -void DreamGenContext::clearWork() { +void DreamBase::clearWork() { memset(workspace(), 0, 320*200); } |