Cleanup.

svn-id: r34185

5 files changed, 4 insertions, 79 deletions

diff --git a/engines/parallaction/objects.cpp b/engines/parallaction/objects.cpp
index d2332643ed..b4776250c6 100644
--- a/engines/parallaction/objects.cpp
+++ b/engines/parallaction/objects.cpp
@@ -180,7 +180,6 @@ Zone::~Zone() {
 
 	case kZoneDoor:
 		free(u.door->_location);
-		free(u.door->_background);
 		u.door->gfxobj->release();
 		delete u.door;
 		break;
@@ -191,7 +190,6 @@ Zone::~Zone() {
 		break;
 
 	case kZoneGet:
-		free(u.get->_backup);
 		u.get->gfxobj->release();
 		delete u.get;
 		break;
diff --git a/engines/parallaction/objects.h b/engines/parallaction/objects.h
index f66e602f68..eee69383b6 100644
--- a/engines/parallaction/objects.h
+++ b/engines/parallaction/objects.h
@@ -192,23 +192,19 @@ struct Dialogue {
 	~Dialogue();
 };
 
-struct GetData {	// size = 24
+struct GetData {
 	uint32			_icon;
 	GfxObj			*gfxobj;
-	byte		   *_backup;
-	uint16			field_14;		// unused
-	uint16			field_16;		// unused
 	MaskBuffer		_mask[2];
 	bool			hasMask;
 
 	GetData() {
 		_icon = 0;
-		_backup = NULL;
 		gfxobj = NULL;
 		hasMask = false;
 	}
 };
-struct SpeakData {	// size = 36
+struct SpeakData {
 	char		_name[32];
 	Dialogue	*_dialogue;
 
@@ -217,30 +213,25 @@ struct SpeakData {	// size = 36
 		_dialogue = NULL;
 	}
 };
-struct ExamineData {	// size = 28
+struct ExamineData {
 	GfxObj	*_cnv;
-	uint16		_opBase;		   // unused
-	uint16		field_12;			// unused
 	char*		_description;
 	char*		_filename;
 
 	ExamineData() {
-		_opBase = 0;
 		_description = NULL;
 		_filename = NULL;
 		_cnv = NULL;
 	}
 };
-struct DoorData {	// size = 28
+struct DoorData {
 	char*	_location;
 	GfxObj	*gfxobj;
-	byte*	_background;
 	Common::Point	_startPos;
 	uint16	_startFrame;
 
 	DoorData() {
 		_location = NULL;
-		_background = NULL;
 		_startFrame = 0;
 		gfxobj = NULL;
 	}
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index c5817b2559..3d2bb979d6 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -147,14 +147,6 @@ int Parallaction::init() {
 	return 0;
 }
 
-
-void Parallaction::clearSet(OpcodeSet &opcodes) {
-	for (Common::Array<const Opcode*>::iterator i = opcodes.begin(); i != opcodes.end(); ++i)
-		delete *i;
-	opcodes.clear();
-}
-
-
 void Parallaction::updateView() {
 
 	if ((_engineFlags & kEnginePauseJobs) && (_input->_inputMode != Input::kInputModeInventory)) {
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index 0113c1689e..32ddb9f90a 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -72,33 +72,6 @@ enum {
 };
 
 
-// high values mean high priority
-
-enum {
-	kPriority0 = 0,
-	kPriority1 = 1,
-	kPriority2 = 2,
-	kPriority3 = 3,
-	kPriority4 = 4,
-	kPriority5 = 5,
-	kPriority6 = 6,
-	kPriority7 = 7,
-	kPriority8 = 8,
-	kPriority9 = 9,
-	kPriority10 = 10,
-	kPriority11 = 11,
-	kPriority12 = 12,
-	kPriority13 = 13,
-	kPriority14 = 14,
-	kPriority15 = 15,
-	kPriority16 = 16,
-	kPriority17 = 17,
-	kPriority18 = 18,
-	kPriority19 = 19,
-	kPriority20 = 20,
-	kPriority21 = 21
-};
-
 enum EngineFlags {
 	kEngineQuit			= (1 << 0),
 	kEnginePauseJobs	= (1 << 1),
@@ -342,7 +315,6 @@ protected:		// data
 protected:		// members
 	bool detectGame(void);
 
-	void		initGlobals();
 	void		runGame();
 	void		updateView();
 
@@ -354,14 +326,10 @@ protected:		// members
 	void		freeLocation();
 	void		showLocationComment(const char *text, bool end);
 
-	void		displayComment(ExamineData *data);
-
 	void		freeCharacter();
 
 	bool		pickupItem(ZonePtr z);
 
-	void 		clearSet(OpcodeSet &opcodes);
-
 
 public:
 	void		scheduleLocationSwitch(const char *location);
@@ -381,15 +349,8 @@ public:
 	void		beep();
 
 	ZonePtr		_zoneTrap;
-	PathBuilder* getPathBuilder(Character *ch);
 
 public:
-//	const char **_zoneFlagNamesRes;
-//	const char **_zoneTypeNamesRes;
-//	const char **_commandsNamesRes;
-	const char **_callableNamesRes;
-	const char **_instructionNamesRes;
-
 	void highlightInventoryItem(ItemPosition pos);
 	int16 getHoverInventoryItem(int16 x, int16 y);
 	int addInventoryItem(ItemName item);
@@ -591,8 +552,6 @@ protected:
 	void		parseLocation(const char *filename);
 	void		loadProgram(AnimationPtr a, const char *filename);
 
-	void		selectStartLocation();
-
 	void		startGui();
 	void		startCreditSequence();
 	void		startEndPartSequence();
@@ -604,8 +563,6 @@ protected:
 
 class Parallaction_br : public Parallaction_ns {
 
-	typedef Parallaction_ns Super;
-
 public:
 	Parallaction_br(OSystem* syst, const PARALLACTIONGameDescription *gameDesc) : Parallaction_ns(syst, gameDesc) { }
 	~Parallaction_br();
diff --git a/engines/parallaction/staticres.cpp b/engines/parallaction/staticres.cpp
index 2c5cf281dd..09353f0466 100644
--- a/engines/parallaction/staticres.cpp
+++ b/engines/parallaction/staticres.cpp
@@ -335,12 +335,6 @@ const Parallaction_br::Callable Parallaction_br::_dosCallables[] = {
 
 void Parallaction_ns::initResources() {
 
-//	_zoneFlagNamesRes = _zoneFlagNamesRes_ns;
-//	_zoneTypeNamesRes = _zoneTypeNamesRes_ns;
-//	_commandsNamesRes = _commandsNamesRes_ns;
-	_callableNamesRes = _callableNamesRes_ns;
-//	_instructionNamesRes = _instructionNamesRes_ns;
-
 	_callableNames = new Table(ARRAYSIZE(_callableNamesRes_ns), _callableNamesRes_ns);
 
 	_localFlagNames = new FixedTable(NUM_LOCATIONS, 1);
@@ -356,13 +350,6 @@ void Parallaction_ns::initResources() {
 
 void Parallaction_br::initResources() {
 
-//	_zoneFlagNamesRes = _zoneFlagNamesRes_br;
-//	_zoneTypeNamesRes = _zoneTypeNamesRes_br;
-//	_commandsNamesRes = _commandsNamesRes_br;
-	_callableNamesRes = _callableNamesRes_br;
-//	_instructionNamesRes = _instructionNamesRes_br;
-//	_audioCommandsNamesRes = _audioCommandsNamesRes_br;
-
 	_callableNames = new Table(ARRAYSIZE(_callableNamesRes_br), _callableNamesRes_br);
 
 	_localFlagNames = new FixedTable(NUM_LOCATIONS, 2);