aboutsummaryrefslogtreecommitdiff
path: root/engines/sword2
diff options
context:
space:
mode:
authorMax Horn2013-04-18 20:14:10 +0200
committerMax Horn2013-04-18 23:50:20 +0200
commitb791edabf7ccba930ad0cea09f9b8449a87d8bcb (patch)
tree711923358724677015a195a6edb657240c3cd18a /engines/sword2
parentcdfd5f85c888525c274f309a4b313f8aa2fa6636 (diff)
downloadscummvm-rg350-b791edabf7ccba930ad0cea09f9b8449a87d8bcb.tar.gz
scummvm-rg350-b791edabf7ccba930ad0cea09f9b8449a87d8bcb.tar.bz2
scummvm-rg350-b791edabf7ccba930ad0cea09f9b8449a87d8bcb.zip
ENGINES: Remove a bunch of unused private member variables
All instances uncovered by clang warnings.
Diffstat (limited to 'engines/sword2')
-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
5 files changed, 4 insertions, 9 deletions
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())