aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorD G Turner2017-01-14 08:43:01 +0000
committerD G Turner2017-01-14 08:43:01 +0000
commit72790f90c20c12b2cebfc66386123996f86cb010 (patch)
treeaedfcd86084afcf4850bb906cc1f4775cade35be /engines
parentd2dd942ad79df0c4ac9d841fb5b0919d260bb79c (diff)
downloadscummvm-rg350-72790f90c20c12b2cebfc66386123996f86cb010.tar.gz
scummvm-rg350-72790f90c20c12b2cebfc66386123996f86cb010.tar.bz2
scummvm-rg350-72790f90c20c12b2cebfc66386123996f86cb010.zip
CHEWY: Fix Various Unused Variable Warnings.
Various engine variables are passed down to sub-objects, but never used currently causing compiler warnings. It is unclear if these are intended to be used in future, but have removed for now, rather than commenting out as that would be messier. Can be restored easily if necessary in future.
Diffstat (limited to 'engines')
-rw-r--r--engines/chewy/chewy.cpp4
-rw-r--r--engines/chewy/cursor.cpp2
-rw-r--r--engines/chewy/cursor.h4
-rw-r--r--engines/chewy/events.cpp4
-rw-r--r--engines/chewy/events.h3
5 files changed, 7 insertions, 10 deletions
diff --git a/engines/chewy/chewy.cpp b/engines/chewy/chewy.cpp
index 75243ccfd0..9df45b1dfb 100644
--- a/engines/chewy/chewy.cpp
+++ b/engines/chewy/chewy.cpp
@@ -69,12 +69,12 @@ ChewyEngine::~ChewyEngine() {
void ChewyEngine::initialize() {
_console = new Console(this);
- _cursor = new Cursor(this);
+ _cursor = new Cursor();
_graphics = new Graphics(this);
_scene = new Scene(this);
_sound = new Sound(_mixer);
_text = new Text();
- _events = new Events(this, _graphics, _console);
+ _events = new Events(this, _console);
_curCursor = 0;
_elapsedFrames = 0;
diff --git a/engines/chewy/cursor.cpp b/engines/chewy/cursor.cpp
index df8a6daf07..4795221e44 100644
--- a/engines/chewy/cursor.cpp
+++ b/engines/chewy/cursor.cpp
@@ -53,7 +53,7 @@ const byte _cursorFrames[] = {
1 // 40: gun
};
-Cursor::Cursor(ChewyEngine *vm) : _vm(vm) {
+Cursor::Cursor() {
_curCursor = 0;
_curCursorFrame = 0;
_cursorSprites = new SpriteResource("cursor.taf");
diff --git a/engines/chewy/cursor.h b/engines/chewy/cursor.h
index 1ab75d0997..de5a707ca6 100644
--- a/engines/chewy/cursor.h
+++ b/engines/chewy/cursor.h
@@ -32,7 +32,7 @@ class Font;
class Cursor {
public:
- Cursor(ChewyEngine *vm);
+ Cursor();
virtual ~Cursor();
void setCursor(uint num, bool newCursor = true);
@@ -42,8 +42,6 @@ public:
void nextCursor();
private:
- ChewyEngine *_vm;
-
uint _curCursor;
uint _curCursorFrame;
SpriteResource *_cursorSprites;
diff --git a/engines/chewy/events.cpp b/engines/chewy/events.cpp
index 55a7b62bff..3da9da2803 100644
--- a/engines/chewy/events.cpp
+++ b/engines/chewy/events.cpp
@@ -32,8 +32,8 @@
namespace Chewy {
-Events::Events(ChewyEngine *vm, Graphics *graphics, Console *console) :
- _vm(vm), _graphics(graphics), _console(console) {
+Events::Events(ChewyEngine *vm, Console *console) :
+ _vm(vm), _console(console) {
_eventManager = g_system->getEventManager();
}
diff --git a/engines/chewy/events.h b/engines/chewy/events.h
index fb2ab408e8..efeafe0535 100644
--- a/engines/chewy/events.h
+++ b/engines/chewy/events.h
@@ -33,7 +33,7 @@ class Console;
class Events {
public:
- Events(ChewyEngine *vm, Graphics *graphics, Console *console);
+ Events(ChewyEngine *vm, Console *console);
virtual ~Events() {}
void processEvents();
@@ -42,7 +42,6 @@ private:
Common::Event _event;
Common::EventManager *_eventManager;
ChewyEngine *_vm;
- Graphics *_graphics;
Console *_console;
};