diff options
author | Johannes Schickel | 2007-04-01 13:10:50 +0000 |
---|---|---|
committer | Johannes Schickel | 2007-04-01 13:10:50 +0000 |
commit | 397c10f059308f575ea75ea767c87148a7406f33 (patch) | |
tree | 6853ed5dca76f46ad6e907aa9bdf5c2fe95c0c8c /engines/kyra/resource.h | |
parent | b7e499b64a1b1dc88c375a6151b7789d1970f4d5 (diff) | |
download | scummvm-rg350-397c10f059308f575ea75ea767c87148a7406f33.tar.gz scummvm-rg350-397c10f059308f575ea75ea767c87148a7406f33.tar.bz2 scummvm-rg350-397c10f059308f575ea75ea767c87148a7406f33.zip |
made _vm/_engine usage consistent. (_engine -> _vm all over the place now).
svn-id: r26342
Diffstat (limited to 'engines/kyra/resource.h')
-rw-r--r-- | engines/kyra/resource.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h index c7fe88a719..27e3917c3f 100644 --- a/engines/kyra/resource.h +++ b/engines/kyra/resource.h @@ -102,7 +102,7 @@ protected: class Resource { public: - Resource(KyraEngine *engine); + Resource(KyraEngine *vm); ~Resource(); bool loadPakFile(const Common::String &filename, const bool forcePC = false); @@ -119,7 +119,7 @@ public: bool loadFileToBuf(const char *file, void *buf, uint32 maxSize); protected: - KyraEngine *_engine; + KyraEngine *_vm; Common::List<ResourceFile*> _pakfiles; }; @@ -207,7 +207,7 @@ struct Room; class StaticResource { public: - StaticResource(KyraEngine *engine) : _engine(engine), _resList(), _fileLoader(0), _builtIn(0), _filenameTable(0) {} + StaticResource(KyraEngine *vm) : _vm(vm), _resList(), _fileLoader(0), _builtIn(0), _filenameTable(0) {} ~StaticResource() { deinit(); } static bool checkKyraDat(); @@ -228,7 +228,7 @@ public: bool prefetchId(int id); void unloadId(int id); private: - KyraEngine *_engine; + KyraEngine *_vm; struct FilenameTable; struct ResData; |