[Scummvm-git-logs] scummvm master -> 72790f90c20c12b2cebfc66386123996f86cb010

[digitall]

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:
72790f90c2 CHEWY: Fix Various Unused Variable Warnings.


Commit: 72790f90c20c12b2cebfc66386123996f86cb010
    https://github.com/scummvm/scummvm/commit/72790f90c20c12b2cebfc66386123996f86cb010
Author: D G Turner (digitall at scummvm.org)
Date: 2017-01-14T08:43:01Z

Commit Message:
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.

Changed paths:
    engines/chewy/chewy.cpp
    engines/chewy/cursor.cpp
    engines/chewy/cursor.h
    engines/chewy/events.cpp
    engines/chewy/events.h


diff --git a/engines/chewy/chewy.cpp b/engines/chewy/chewy.cpp
index 75243cc..9df45b1 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 df8a6da..4795221 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 1ab75d0..de5a707 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 55a7b62..3da9da2 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 fb2ab40..efeafe0 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;
 };