diff options
author | Paul Gilbert | 2015-11-27 12:40:33 -0500 |
---|---|---|
committer | Paul Gilbert | 2015-11-27 12:40:33 -0500 |
commit | 1fe6e92bf9cd22becab56656444e1ae471ce6746 (patch) | |
tree | 27a213bb43381c1d1e4c72961399810bd27cda85 | |
parent | a6150f9308f24f55793b8be07f8756d39763b59b (diff) | |
download | scummvm-rg350-1fe6e92bf9cd22becab56656444e1ae471ce6746.tar.gz scummvm-rg350-1fe6e92bf9cd22becab56656444e1ae471ce6746.tar.bz2 scummvm-rg350-1fe6e92bf9cd22becab56656444e1ae471ce6746.zip |
ACCESS: Silence gcc warnings
-rw-r--r-- | engines/access/amazon/amazon_resources.cpp | 3 | ||||
-rw-r--r-- | engines/access/amazon/amazon_resources.h | 3 | ||||
-rw-r--r-- | engines/access/martian/martian_resources.cpp | 5 | ||||
-rw-r--r-- | engines/access/martian/martian_resources.h | 3 | ||||
-rw-r--r-- | engines/access/resources.cpp | 3 | ||||
-rw-r--r-- | engines/access/resources.h | 3 |
6 files changed, 6 insertions, 14 deletions
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp index 2be1c0f8ba..7dbe1c9f90 100644 --- a/engines/access/amazon/amazon_resources.cpp +++ b/engines/access/amazon/amazon_resources.cpp @@ -27,9 +27,6 @@ namespace Access { namespace Amazon { -AmazonResources::AmazonResources(AccessEngine *vm): Resources(vm) { -} - void AmazonResources::load(Common::SeekableReadStream &s) { Resources::load(s); uint count; diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h index ca0bfeb5b7..20d90cc5b6 100644 --- a/engines/access/amazon/amazon_resources.h +++ b/engines/access/amazon/amazon_resources.h @@ -140,7 +140,8 @@ public: Common::String HELPLVLTXT[3]; Common::String IQLABELS[9]; public: - AmazonResources(AccessEngine *vm); + AmazonResources(AccessEngine *vm) : Resources(vm) {} + virtual ~AmazonResources() {} }; #define AMRES (*((Amazon::AmazonResources *)_vm->_res)) diff --git a/engines/access/martian/martian_resources.cpp b/engines/access/martian/martian_resources.cpp index dc75b83379..070fa0f7e3 100644 --- a/engines/access/martian/martian_resources.cpp +++ b/engines/access/martian/martian_resources.cpp @@ -27,11 +27,6 @@ namespace Access { namespace Martian { -MartianResources::MartianResources(AccessEngine *vm) : Resources(vm) { -} - -/*------------------------------------------------------------------------*/ - const int SIDEOFFR[] = { 4, 0, 7, 10, 3, 1, 2, 13, 0, 0, 0, 0 }; const int SIDEOFFL[] = { 11, 6, 1, 4, 10, 6, 1, 4, 0, 0, 0, 0 }; const int SIDEOFFU[] = { 1, 2, 0, 2, 2, 1, 1, 0, 0, 0, 0, 0 }; diff --git a/engines/access/martian/martian_resources.h b/engines/access/martian/martian_resources.h index 3a4d08b007..46cf6a71c1 100644 --- a/engines/access/martian/martian_resources.h +++ b/engines/access/martian/martian_resources.h @@ -58,7 +58,8 @@ class MartianResources : public Resources { public: public: - MartianResources(AccessEngine *vm); + MartianResources(AccessEngine *vm) : Resources(vm) {} + virtual ~MartianResources() {} }; #define MMRES (*((Martian::MartianResources *)_vm->_res)) diff --git a/engines/access/resources.cpp b/engines/access/resources.cpp index 3dbdc9242b..c11dbf6331 100644 --- a/engines/access/resources.cpp +++ b/engines/access/resources.cpp @@ -36,9 +36,6 @@ Resources *Resources::init(AccessEngine *vm) { error("Unknown game"); } -Resources::Resources(AccessEngine *vm): _vm(vm) { -} - bool Resources::load(Common::String &errorMessage) { Common::File f; if (!f.open("access.dat")) { diff --git a/engines/access/resources.h b/engines/access/resources.h index a9218036b5..bb5c3f9f61 100644 --- a/engines/access/resources.h +++ b/engines/access/resources.h @@ -88,7 +88,8 @@ public: Common::Array< Common::Array<byte> > CURSORS; Common::String CANT_GET_THERE; public: - Resources(AccessEngine *vm); + Resources(AccessEngine *vm) : _vm(vm) {} + virtual ~Resources() {} static Resources *init(AccessEngine *vm); /** |