ENGINES: Remove a bunch of unused private member variables
All instances uncovered by clang warnings.
This commit is contained in:
parent
cdfd5f85c8
commit
b791edabf7
17 changed files with 12 additions and 29 deletions
|
@ -79,8 +79,6 @@ private:
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
GobEngine *_vm;
|
|
||||||
|
|
||||||
Surface *_frame;
|
Surface *_frame;
|
||||||
ANIObject *_bundle;
|
ANIObject *_bundle;
|
||||||
|
|
||||||
|
|
|
@ -62,11 +62,11 @@ private:
|
||||||
bool _flagEight;
|
bool _flagEight;
|
||||||
bool _flagNine;
|
bool _flagNine;
|
||||||
|
|
||||||
bool _flagSkipStill;
|
//bool _flagSkipStill;
|
||||||
bool _flagSkipPalette;
|
bool _flagSkipPalette;
|
||||||
bool _flagFirstFrame;
|
bool _flagFirstFrame;
|
||||||
bool _flagTransparent;
|
//bool _flagTransparent;
|
||||||
bool _flagUpdateStill;
|
//bool _flagUpdateStill;
|
||||||
|
|
||||||
void getStill(Common::ReadStream *in);
|
void getStill(Common::ReadStream *in);
|
||||||
void getDelta(Common::ReadStream *in);
|
void getDelta(Common::ReadStream *in);
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
namespace Parallaction {
|
namespace Parallaction {
|
||||||
|
|
||||||
GfxObj::GfxObj(uint objType, Frames *frames, const char* name) :
|
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) {
|
type(objType), frame(0), layer(3), scale(100), _hasMask(false), _hasPath(false) {
|
||||||
|
|
||||||
if (name) {
|
if (name) {
|
||||||
|
|
|
@ -289,8 +289,6 @@ class GfxObj {
|
||||||
char *_name;
|
char *_name;
|
||||||
Frames *_frames;
|
Frames *_frames;
|
||||||
|
|
||||||
bool _keep;
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
int16 x, y;
|
int16 x, y;
|
||||||
|
|
||||||
|
|
|
@ -50,12 +50,12 @@ const Verb Input::_verbKeys[] = {
|
||||||
VERB_USE
|
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),
|
_system(system), _eventMan(system->getEventManager()), _fastMode(false),
|
||||||
_keyVerb(VERB_NONE), _cutawayRunning(false), _canQuit(false),
|
_keyVerb(VERB_NONE), _cutawayRunning(false), _canQuit(false),
|
||||||
_cutawayQuit(false), _dialogueRunning(false), _talkQuit(false),
|
_cutawayQuit(false), _dialogueRunning(false), _talkQuit(false),
|
||||||
_quickSave(false), _quickLoad(false), _debugger(false), _inKey(Common::KEYCODE_INVALID),
|
_quickSave(false), _quickLoad(false), _debugger(false), _inKey(Common::KEYCODE_INVALID),
|
||||||
_mouseButton(0), _idleTime(0) , _vm(vm) {
|
_mouseButton(0), _idleTime(0) {
|
||||||
|
|
||||||
switch (language) {
|
switch (language) {
|
||||||
case Common::EN_ANY:
|
case Common::EN_ANY:
|
||||||
|
|
|
@ -46,7 +46,7 @@ public:
|
||||||
MOUSE_RBUTTON = 2
|
MOUSE_RBUTTON = 2
|
||||||
};
|
};
|
||||||
|
|
||||||
Input(Common::Language language, OSystem *system, QueenEngine *vm);
|
Input(Common::Language language, OSystem *system);
|
||||||
|
|
||||||
void delay(uint amount);
|
void delay(uint amount);
|
||||||
|
|
||||||
|
@ -96,8 +96,6 @@ private:
|
||||||
|
|
||||||
Common::EventManager *_eventMan;
|
Common::EventManager *_eventMan;
|
||||||
|
|
||||||
QueenEngine *_vm;
|
|
||||||
|
|
||||||
//! some cutaways require update() run faster
|
//! some cutaways require update() run faster
|
||||||
bool _fastMode;
|
bool _fastMode;
|
||||||
|
|
||||||
|
|
|
@ -500,7 +500,7 @@ Common::Error QueenEngine::run() {
|
||||||
_display = new Display(this, _system);
|
_display = new Display(this, _system);
|
||||||
_graphics = new Graphics(this);
|
_graphics = new Graphics(this);
|
||||||
_grid = new Grid(this);
|
_grid = new Grid(this);
|
||||||
_input = new Input(_resource->getLanguage(), _system, this);
|
_input = new Input(_resource->getLanguage(), _system);
|
||||||
|
|
||||||
if (_resource->isDemo()) {
|
if (_resource->isDemo()) {
|
||||||
_logic = new LogicDemo(this);
|
_logic = new LogicDemo(this);
|
||||||
|
|
|
@ -88,8 +88,6 @@ private:
|
||||||
|
|
||||||
QueenEngine *_vm;
|
QueenEngine *_vm;
|
||||||
|
|
||||||
bool _wasFullscren;
|
|
||||||
|
|
||||||
//! Raw .dog file data (without 20 byte header)
|
//! Raw .dog file data (without 20 byte header)
|
||||||
byte *_fileData;
|
byte *_fileData;
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,6 @@ public:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
ScummEngine *_vm;
|
ScummEngine *_vm;
|
||||||
bool _old_soundsPaused;
|
|
||||||
|
|
||||||
// Commands
|
// Commands
|
||||||
bool Cmd_Room(int argc, const char **argv);
|
bool Cmd_Room(int argc, const char **argv);
|
||||||
|
|
|
@ -55,7 +55,6 @@ private:
|
||||||
|
|
||||||
Video::VideoDecoder *_video;
|
Video::VideoDecoder *_video;
|
||||||
|
|
||||||
char baseName[40];
|
|
||||||
uint32 _flags;
|
uint32 _flags;
|
||||||
uint32 _wizResNum;
|
uint32 _wizResNum;
|
||||||
};
|
};
|
||||||
|
|
|
@ -117,8 +117,6 @@ private:
|
||||||
|
|
||||||
Glyph _glyph[SIZE_OF_CHAR_SET];
|
Glyph _glyph[SIZE_OF_CHAR_SET];
|
||||||
|
|
||||||
int _fontId;
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
enum {
|
enum {
|
||||||
kAlignLeft,
|
kAlignLeft,
|
||||||
|
@ -142,7 +140,7 @@ public:
|
||||||
};
|
};
|
||||||
|
|
||||||
FontRendererGui::FontRendererGui(Sword2Engine *vm, int fontId)
|
FontRendererGui::FontRendererGui(Sword2Engine *vm, int fontId)
|
||||||
: _vm(vm), _fontId(fontId) {
|
: _vm(vm) {
|
||||||
byte *font = _vm->_resman->openResource(fontId);
|
byte *font = _vm->_resman->openResource(fontId);
|
||||||
SpriteInfo sprite;
|
SpriteInfo sprite;
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,7 @@
|
||||||
|
|
||||||
namespace Sword2 {
|
namespace Sword2 {
|
||||||
|
|
||||||
MemoryManager::MemoryManager(Sword2Engine *vm) : _vm(vm) {
|
MemoryManager::MemoryManager() {
|
||||||
// The id stack contains all the possible ids for the memory blocks.
|
// 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.
|
// We use this to ensure that no two blocks ever have the same id.
|
||||||
|
|
||||||
|
|
|
@ -40,8 +40,6 @@ struct MemBlock {
|
||||||
|
|
||||||
class MemoryManager {
|
class MemoryManager {
|
||||||
private:
|
private:
|
||||||
Sword2Engine *_vm;
|
|
||||||
|
|
||||||
MemBlock *_memBlocks;
|
MemBlock *_memBlocks;
|
||||||
MemBlock **_memBlockIndex;
|
MemBlock **_memBlockIndex;
|
||||||
int16 _numBlocks;
|
int16 _numBlocks;
|
||||||
|
@ -56,7 +54,7 @@ private:
|
||||||
int16 findInsertionPointInIndex(byte *ptr);
|
int16 findInsertionPointInIndex(byte *ptr);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
MemoryManager(Sword2Engine *vm);
|
MemoryManager();
|
||||||
~MemoryManager();
|
~MemoryManager();
|
||||||
|
|
||||||
int16 getNumBlocks() { return _numBlocks; }
|
int16 getNumBlocks() { return _numBlocks; }
|
||||||
|
|
|
@ -142,7 +142,6 @@ private:
|
||||||
bool _looping;
|
bool _looping;
|
||||||
int32 _fading;
|
int32 _fading;
|
||||||
int32 _fadeSamples;
|
int32 _fadeSamples;
|
||||||
bool _paused;
|
|
||||||
|
|
||||||
void refill();
|
void refill();
|
||||||
|
|
||||||
|
|
|
@ -450,7 +450,7 @@ Common::Error Sword2Engine::run() {
|
||||||
|
|
||||||
_debugger = new Debugger(this);
|
_debugger = new Debugger(this);
|
||||||
|
|
||||||
_memory = new MemoryManager(this);
|
_memory = new MemoryManager();
|
||||||
_resman = new ResourceManager(this);
|
_resman = new ResourceManager(this);
|
||||||
|
|
||||||
if (!_resman->init())
|
if (!_resman->init())
|
||||||
|
|
|
@ -162,7 +162,6 @@ public:
|
||||||
|
|
||||||
class GfxFontBackup {
|
class GfxFontBackup {
|
||||||
private:
|
private:
|
||||||
GfxSurface *_surface;
|
|
||||||
Common::Point _edgeSize;
|
Common::Point _edgeSize;
|
||||||
Common::Point _position;
|
Common::Point _position;
|
||||||
GfxColors _colors;
|
GfxColors _colors;
|
||||||
|
|
|
@ -44,7 +44,6 @@ public:
|
||||||
BaseImage *_scummVMThumb;
|
BaseImage *_scummVMThumb;
|
||||||
private:
|
private:
|
||||||
BaseImage *storeThumb(bool doFlip, int width, int height);
|
BaseImage *storeThumb(bool doFlip, int width, int height);
|
||||||
BaseImage *_richThumbnail;
|
|
||||||
BaseGame *_gameRef;
|
BaseGame *_gameRef;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue