Cleanup.

This removes a bunch of debugging code/commands that either didn't do
anything useful under ScummVM (e.g. "soft" and "hard"), or which did things
that was already easily avaiable elsewhere (e.g. "save" and "restore").

I didn't have the heart to remove the "tony" command, though. :-)

svn-id: r13422

1 files changed, 11 insertions, 12 deletions

diff --git a/sword2/logic.h b/sword2/logic.h
index cae30e379f..67c860c911 100644
--- a/sword2/logic.h
+++ b/sword2/logic.h
@@ -53,9 +53,6 @@ private:
 	// keeps note of no. of objects in the kill list
 	uint32 _kills;
 
-	// Set this to turn debugging on
-	bool _debugFlag;
-
 	// denotes the res id of the game-object-list in current use
 	uint32 _currentRunList;
 
@@ -67,6 +64,13 @@ private:
 
 	void processKillList(void);
 
+	struct EventUnit {
+		uint32 id;
+		uint32 interact_id;
+	};
+
+	EventUnit _eventList[MAX_events];
+
 	// Stores resource id of the wav to use as lead-out from smacker
 	uint32 _smackerLeadOut;
 
@@ -160,7 +164,7 @@ private:
 
 public:
 	Logic(Sword2Engine *vm) :
-		  _vm(vm), _kills(0), _debugFlag(false), _smackerLeadOut(0),
+		  _vm(vm), _kills(0), _smackerLeadOut(0),
 		  _sequenceTextLines(0), _speechTime(0), _animId(0),
 		  _speechAnimType(0), _leftClickDelay(0), _rightClickDelay(0),
 		  _defaultResponseId(0), _totalStartups(0),
@@ -209,17 +213,10 @@ public:
 
 	int runScript(char *scriptData, char *objectData, uint32 *offset);
 
-	struct EventUnit {
-		uint32 id;
-		uint32 interact_id;
-	};
-
-	EventUnit _eventList[MAX_events];
-
 	void sendEvent(uint32 id, uint32 interact_id);
 	void setPlayerActionEvent(uint32 id, uint32 interact_id);
 	void startEvent(void);
-	bool checkEventWaiting(void);
+	int checkEventWaiting(void);
 	void clearEvent(uint32 id);
 	void killAllIdsEvents(uint32 id);
 
@@ -374,6 +371,8 @@ public:
 	void totalRestart(void);
 	void examineRunList(void);
 	void resetKillList(void);
+
+	void printEventList(void);
 };
 
 } // End of namespace Sword2