diff options
| author | Strangerke | 2015-11-30 00:34:43 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-12-23 21:33:44 +0100 |
| commit | 771e558d905ee467280482d62697dc66d969ed2b (patch) | |
| tree | e9eeada2ac2552d74c7213b00ef45270721b0a6e /engines/lab/labsets.cpp | |
| parent | 0c84355f4ae5651e7667b9aa0d2d3c6c28f21496 (diff) | |
| download | scummvm-rg350-771e558d905ee467280482d62697dc66d969ed2b.tar.gz scummvm-rg350-771e558d905ee467280482d62697dc66d969ed2b.tar.bz2 scummvm-rg350-771e558d905ee467280482d62697dc66d969ed2b.zip | |
LAB: Move the global variable g_resource to the main engine class
Diffstat (limited to 'engines/lab/labsets.cpp')
| -rw-r--r-- | engines/lab/labsets.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/lab/labsets.cpp b/engines/lab/labsets.cpp index 4dcc0c8ebc..edd764668b 100644 --- a/engines/lab/labsets.cpp +++ b/engines/lab/labsets.cpp @@ -28,13 +28,14 @@ * */ +#include "lab/lab.h" #include "lab/stddefines.h" #include "lab/labfun.h" #include "lab/resource.h" namespace Lab { -LargeSet::LargeSet(uint16 last) { + LargeSet::LargeSet(uint16 last, LabEngine *vm) : _vm(vm) { last = (((last + 15) >> 4) << 4); _array = (uint16 *)calloc(last >> 3, 2); @@ -60,7 +61,7 @@ void LargeSet::exclElement(uint16 element) { bool LargeSet::readInitialConditions(const char *fileName) { Common::File *file; - if (file = g_resource->openDataFile(fileName, MKTAG('C', 'O', 'N', '0'))) { + if (file = _vm->_resource->openDataFile(fileName, MKTAG('C', 'O', 'N', '0'))) { uint16 conditions = file->readUint16LE(); for (int i = 0; i < conditions; i++) { inclElement(file->readUint16LE()); |