[Scummvm-cvs-logs] scummvm master -> 1fe6e92bf9cd22becab56656444e1ae471ce6746

dreammaster dreammaster at scummvm.org
Fri Nov 27 18:41:05 CET 2015


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1fe6e92bf9 ACCESS: Silence gcc warnings


Commit: 1fe6e92bf9cd22becab56656444e1ae471ce6746
    https://github.com/scummvm/scummvm/commit/1fe6e92bf9cd22becab56656444e1ae471ce6746
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-11-27T12:40:33-05:00

Commit Message:
ACCESS: Silence gcc warnings

Changed paths:
    engines/access/amazon/amazon_resources.cpp
    engines/access/amazon/amazon_resources.h
    engines/access/martian/martian_resources.cpp
    engines/access/martian/martian_resources.h
    engines/access/resources.cpp
    engines/access/resources.h



diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 2be1c0f..7dbe1c9 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 ca0bfeb..20d90cc 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 dc75b83..070fa0f 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 3a4d08b..46cf6a7 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 3dbdc92..c11dbf6 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 a921803..bb5c3f9 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);
 
 	/**






More information about the Scummvm-git-logs mailing list