aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/gob/pregob/onceupon/stork.h2
-rw-r--r--engines/groovie/vdx.h6
-rw-r--r--engines/parallaction/gfxbase.cpp2
-rw-r--r--engines/parallaction/graphics.h2
-rw-r--r--engines/queen/input.cpp4
-rw-r--r--engines/queen/input.h4
-rw-r--r--engines/queen/queen.cpp2
-rw-r--r--engines/queen/talk.h2
-rw-r--r--engines/scumm/debugger.h1
-rw-r--r--engines/scumm/he/animation_he.h1
-rw-r--r--engines/sword2/controls.cpp4
-rw-r--r--engines/sword2/memory.cpp2
-rw-r--r--engines/sword2/memory.h4
-rw-r--r--engines/sword2/sound.h1
-rw-r--r--engines/sword2/sword2.cpp2
-rw-r--r--engines/tsage/graphics.h1
-rw-r--r--engines/wintermute/base/save_thumb_helper.h1
17 files changed, 12 insertions, 29 deletions
diff --git a/engines/gob/pregob/onceupon/stork.h b/engines/gob/pregob/onceupon/stork.h
index 756f5258c7..ae57983000 100644
--- a/engines/gob/pregob/onceupon/stork.h
+++ b/engines/gob/pregob/onceupon/stork.h
@@ -79,8 +79,6 @@ private:
};
- GobEngine *_vm;
-
Surface *_frame;
ANIObject *_bundle;
diff --git a/engines/groovie/vdx.h b/engines/groovie/vdx.h
index ebe58cb119..a9bfaa1eb4 100644
--- a/engines/groovie/vdx.h
+++ b/engines/groovie/vdx.h
@@ -62,11 +62,11 @@ private:
bool _flagEight;
bool _flagNine;
- bool _flagSkipStill;
+ //bool _flagSkipStill;
bool _flagSkipPalette;
bool _flagFirstFrame;
- bool _flagTransparent;
- bool _flagUpdateStill;
+ //bool _flagTransparent;
+ //bool _flagUpdateStill;
void getStill(Common::ReadStream *in);
void getDelta(Common::ReadStream *in);
diff --git a/engines/parallaction/gfxbase.cpp b/engines/parallaction/gfxbase.cpp
index a9889cc7af..e2d9532c8a 100644
--- a/engines/parallaction/gfxbase.cpp
+++ b/engines/parallaction/gfxbase.cpp
@@ -31,7 +31,7 @@
namespace Parallaction {
GfxObj::GfxObj(uint objType, Frames *frames, const char* name) :
- _frames(frames), _keep(true), x(0), y(0), z(0), _prog(0), _flags(0),
+ _frames(frames), x(0), y(0), z(0), _prog(0), _flags(0),
type(objType), frame(0), layer(3), scale(100), _hasMask(false), _hasPath(false) {
if (name) {
diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h
index e9daabb194..55c1c0c04e 100644
--- a/engines/parallaction/graphics.h
+++ b/engines/parallaction/graphics.h
@@ -289,8 +289,6 @@ class GfxObj {
char *_name;
Frames *_frames;
- bool _keep;
-
public:
int16 x, y;
diff --git a/engines/queen/input.cpp b/engines/queen/input.cpp
index 30bf681e63..dd10e7ad46 100644
--- a/engines/queen/input.cpp
+++ b/engines/queen/input.cpp
@@ -50,12 +50,12 @@ const Verb Input::_verbKeys[] = {
VERB_USE
};
-Input::Input(Common::Language language, OSystem *system, QueenEngine *vm) :
+Input::Input(Common::Language language, OSystem *system) :
_system(system), _eventMan(system->getEventManager()), _fastMode(false),
_keyVerb(VERB_NONE), _cutawayRunning(false), _canQuit(false),
_cutawayQuit(false), _dialogueRunning(false), _talkQuit(false),
_quickSave(false), _quickLoad(false), _debugger(false), _inKey(Common::KEYCODE_INVALID),
- _mouseButton(0), _idleTime(0) , _vm(vm) {
+ _mouseButton(0), _idleTime(0) {
switch (language) {
case Common::EN_ANY:
diff --git a/engines/queen/input.h b/engines/queen/input.h
index b3bf811cd1..f04ecb24f7 100644
--- a/engines/queen/input.h
+++ b/engines/queen/input.h
@@ -46,7 +46,7 @@ public:
MOUSE_RBUTTON = 2
};
- Input(Common::Language language, OSystem *system, QueenEngine *vm);
+ Input(Common::Language language, OSystem *system);
void delay(uint amount);
@@ -96,8 +96,6 @@ private:
Common::EventManager *_eventMan;
- QueenEngine *_vm;
-
//! some cutaways require update() run faster
bool _fastMode;
diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp
index c403536e22..08fc594560 100644
--- a/engines/queen/queen.cpp
+++ b/engines/queen/queen.cpp
@@ -500,7 +500,7 @@ Common::Error QueenEngine::run() {
_display = new Display(this, _system);
_graphics = new Graphics(this);
_grid = new Grid(this);
- _input = new Input(_resource->getLanguage(), _system, this);
+ _input = new Input(_resource->getLanguage(), _system);
if (_resource->isDemo()) {
_logic = new LogicDemo(this);
diff --git a/engines/queen/talk.h b/engines/queen/talk.h
index 68196784b1..cba77cc255 100644
--- a/engines/queen/talk.h
+++ b/engines/queen/talk.h
@@ -88,8 +88,6 @@ private:
QueenEngine *_vm;
- bool _wasFullscren;
-
//! Raw .dog file data (without 20 byte header)
byte *_fileData;
diff --git a/engines/scumm/debugger.h b/engines/scumm/debugger.h
index a9b340d691..b60a1a2f03 100644
--- a/engines/scumm/debugger.h
+++ b/engines/scumm/debugger.h
@@ -35,7 +35,6 @@ public:
private:
ScummEngine *_vm;
- bool _old_soundsPaused;
// Commands
bool Cmd_Room(int argc, const char **argv);
diff --git a/engines/scumm/he/animation_he.h b/engines/scumm/he/animation_he.h
index 7fa31a195d..e17c1b9a39 100644
--- a/engines/scumm/he/animation_he.h
+++ b/engines/scumm/he/animation_he.h
@@ -55,7 +55,6 @@ private:
Video::VideoDecoder *_video;
- char baseName[40];
uint32 _flags;
uint32 _wizResNum;
};
diff --git a/engines/sword2/controls.cpp b/engines/sword2/controls.cpp
index 3611294eb8..a4b540ac7b 100644
--- a/engines/sword2/controls.cpp
+++ b/engines/sword2/controls.cpp
@@ -117,8 +117,6 @@ private:
Glyph _glyph[SIZE_OF_CHAR_SET];
- int _fontId;
-
public:
enum {
kAlignLeft,
@@ -142,7 +140,7 @@ public:
};
FontRendererGui::FontRendererGui(Sword2Engine *vm, int fontId)
- : _vm(vm), _fontId(fontId) {
+ : _vm(vm) {
byte *font = _vm->_resman->openResource(fontId);
SpriteInfo sprite;
diff --git a/engines/sword2/memory.cpp b/engines/sword2/memory.cpp
index 5fd2d4e78e..391983930d 100644
--- a/engines/sword2/memory.cpp
+++ b/engines/sword2/memory.cpp
@@ -52,7 +52,7 @@
namespace Sword2 {
-MemoryManager::MemoryManager(Sword2Engine *vm) : _vm(vm) {
+MemoryManager::MemoryManager() {
// The id stack contains all the possible ids for the memory blocks.
// We use this to ensure that no two blocks ever have the same id.
diff --git a/engines/sword2/memory.h b/engines/sword2/memory.h
index 3f511dd5db..250da138c2 100644
--- a/engines/sword2/memory.h
+++ b/engines/sword2/memory.h
@@ -40,8 +40,6 @@ struct MemBlock {
class MemoryManager {
private:
- Sword2Engine *_vm;
-
MemBlock *_memBlocks;
MemBlock **_memBlockIndex;
int16 _numBlocks;
@@ -56,7 +54,7 @@ private:
int16 findInsertionPointInIndex(byte *ptr);
public:
- MemoryManager(Sword2Engine *vm);
+ MemoryManager();
~MemoryManager();
int16 getNumBlocks() { return _numBlocks; }
diff --git a/engines/sword2/sound.h b/engines/sword2/sound.h
index 9a59ef27a8..e250707fb9 100644
--- a/engines/sword2/sound.h
+++ b/engines/sword2/sound.h
@@ -142,7 +142,6 @@ private:
bool _looping;
int32 _fading;
int32 _fadeSamples;
- bool _paused;
void refill();
diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp
index dfa6a23320..d4a564e2c0 100644
--- a/engines/sword2/sword2.cpp
+++ b/engines/sword2/sword2.cpp
@@ -450,7 +450,7 @@ Common::Error Sword2Engine::run() {
_debugger = new Debugger(this);
- _memory = new MemoryManager(this);
+ _memory = new MemoryManager();
_resman = new ResourceManager(this);
if (!_resman->init())
diff --git a/engines/tsage/graphics.h b/engines/tsage/graphics.h
index 9175b1050a..826f2fef6f 100644
--- a/engines/tsage/graphics.h
+++ b/engines/tsage/graphics.h
@@ -162,7 +162,6 @@ public:
class GfxFontBackup {
private:
- GfxSurface *_surface;
Common::Point _edgeSize;
Common::Point _position;
GfxColors _colors;
diff --git a/engines/wintermute/base/save_thumb_helper.h b/engines/wintermute/base/save_thumb_helper.h
index 43cc7e39a7..0efae26a4a 100644
--- a/engines/wintermute/base/save_thumb_helper.h
+++ b/engines/wintermute/base/save_thumb_helper.h
@@ -44,7 +44,6 @@ public:
BaseImage *_scummVMThumb;
private:
BaseImage *storeThumb(bool doFlip, int width, int height);
- BaseImage *_richThumbnail;
BaseGame *_gameRef;
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 15:15:02 +0000