From fc0adb846a4aa5de82de475c1ba2270f2210f767 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Mon, 1 Nov 2010 11:29:57 +0000
Subject: SWORD2: Cleanup

Removed some of the debug code that has never ever been enabled for as
long as this engine has been in ScummVM.

svn-id: r53998
---
 engines/sword2/debug.cpp  |  9 ---------
 engines/sword2/sword2.cpp | 36 ------------------------------------
 engines/sword2/sword2.h   |  5 -----
 3 files changed, 50 deletions(-)

(limited to 'engines/sword2')

diff --git a/engines/sword2/debug.cpp b/engines/sword2/debug.cpp
index 8f9f54ad5c..cb3c3b6a30 100644
--- a/engines/sword2/debug.cpp
+++ b/engines/sword2/debug.cpp
@@ -120,15 +120,6 @@ void Debugger::buildDebugText() {
 		makeDebugTextBlock(buf, 0, 105);
 	}
 
-#ifdef SWORD2_DEBUG
-	// speed-up indicator
-
-	if (_vm->_renderSkip) {		// see sword2.cpp
-		sprintf(buf, "SKIPPING FRAMES FOR SPEED-UP!");
-		makeDebugTextBlock(buf, 0, 120);
-	}
-#endif
-
 	// debug info at top of screen - enabled/disabled as one complete unit
 
 	if (_displayTime) {
diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp
index 1d56306f58..9c67fcdf25 100644
--- a/engines/sword2/sword2.cpp
+++ b/engines/sword2/sword2.cpp
@@ -290,11 +290,6 @@ Sword2Engine::Sword2Engine(OSystem *syst) : Engine(syst) {
 
 	_wantSfxDebug = false;
 
-#ifdef SWORD2_DEBUG
-	_stepOneCycle = false;
-	_renderSkip = false;
-#endif
-
 	_gameCycle = 0;
 	_gameSpeed = 1;
 
@@ -479,13 +474,6 @@ Common::Error Sword2Engine::run() {
 	while (1) {
 		_debugger->onFrame();
 
-#ifdef SWORD2_DEBUG
-		if (_stepOneCycle) {
-			pauseEngine(true);
-			_stepOneCycle = false;
-		}
-#endif
-
 		// Handle GMM Loading
 		if (_gmmLoadSlot != -1) {
 
@@ -519,12 +507,7 @@ Common::Error Sword2Engine::run() {
 						pauseEngine(false);
 					} else {
 						pauseEngine(true);
-#ifdef SWORD2_DEBUG
-						if (!_stepOneCycle)
-							_screen->dimPalette(true);
-#else
 						_screen->dimPalette(true);
-#endif
 					}
 					break;
 #if 0
@@ -538,17 +521,6 @@ Common::Error Sword2Engine::run() {
 						screenInfo->new_palette = 99;
 					}
 					break;
-#endif
-#ifdef SWORD2_DEBUG
-				case Common::KEYCODE_SPACE:
-					if (_gamePaused) {
-						_stepOneCycle = true;
-						pauseEngine(false);
-					}
-					break;
-				case Common::KEYCODE_s:
-					_renderSkip = !_renderSkip;
-					break;
 #endif
 				default:
 					break;
@@ -572,15 +544,7 @@ Common::Error Sword2Engine::run() {
 		// creates the debug text blocks
 		_debugger->buildDebugText();
 
-#ifdef SWORD2_DEBUG
-		// if not in console & '_renderSkip' is set, only render
-		// display once every 4 game-cycles
-
-		if (!_renderSkip || (_gameCycle % 4) == 0)
-			_screen->buildDisplay();
-#else
 		_screen->buildDisplay();
-#endif
 	}
 
 	return Common::kNoError;
diff --git a/engines/sword2/sword2.h b/engines/sword2/sword2.h
index ed1c335474..302627b635 100644
--- a/engines/sword2/sword2.h
+++ b/engines/sword2/sword2.h
@@ -202,11 +202,6 @@ public:
 
 	int32 _gameCycle;
 
-#ifdef SWORD2_DEBUG
-	bool _renderSkip;
-	bool _stepOneCycle;
-#endif
-
 #if RIGHT_CLICK_CLEARS_LUGGAGE
 	bool heldIsInInventory();
 #endif
-- 
cgit v1.2.3