[Scummvm-cvs-logs] SF.net SVN: scummvm:[53998] scummvm/trunk/engines/sword2

[eriktorbjorn at users.sourceforge.net]

Revision: 53998
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53998&view=rev
Author:   eriktorbjorn
Date:     2010-11-01 11:29:57 +0000 (Mon, 01 Nov 2010)

Log Message:
-----------
SWORD2: Cleanup

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

Modified Paths:
--------------
    scummvm/trunk/engines/sword2/debug.cpp
    scummvm/trunk/engines/sword2/sword2.cpp
    scummvm/trunk/engines/sword2/sword2.h

Modified: scummvm/trunk/engines/sword2/debug.cpp
===================================================================
--- scummvm/trunk/engines/sword2/debug.cpp	2010-11-01 11:25:11 UTC (rev 53997)
+++ scummvm/trunk/engines/sword2/debug.cpp	2010-11-01 11:29:57 UTC (rev 53998)
@@ -120,15 +120,6 @@
 		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) {

Modified: scummvm/trunk/engines/sword2/sword2.cpp
===================================================================
--- scummvm/trunk/engines/sword2/sword2.cpp	2010-11-01 11:25:11 UTC (rev 53997)
+++ scummvm/trunk/engines/sword2/sword2.cpp	2010-11-01 11:29:57 UTC (rev 53998)
@@ -290,11 +290,6 @@
 
 	_wantSfxDebug = false;
 
-#ifdef SWORD2_DEBUG
-	_stepOneCycle = false;
-	_renderSkip = false;
-#endif
-
 	_gameCycle = 0;
 	_gameSpeed = 1;
 
@@ -479,13 +474,6 @@
 	while (1) {
 		_debugger->onFrame();
 
-#ifdef SWORD2_DEBUG
-		if (_stepOneCycle) {
-			pauseEngine(true);
-			_stepOneCycle = false;
-		}
-#endif
-
 		// Handle GMM Loading
 		if (_gmmLoadSlot != -1) {
 
@@ -519,12 +507,7 @@
 						pauseEngine(false);
 					} else {
 						pauseEngine(true);
-#ifdef SWORD2_DEBUG
-						if (!_stepOneCycle)
-							_screen->dimPalette(true);
-#else
 						_screen->dimPalette(true);
-#endif
 					}
 					break;
 #if 0
@@ -539,17 +522,6 @@
 					}
 					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 @@
 		// 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;

Modified: scummvm/trunk/engines/sword2/sword2.h
===================================================================
--- scummvm/trunk/engines/sword2/sword2.h	2010-11-01 11:25:11 UTC (rev 53997)
+++ scummvm/trunk/engines/sword2/sword2.h	2010-11-01 11:29:57 UTC (rev 53998)
@@ -202,11 +202,6 @@
 
 	int32 _gameCycle;
 
-#ifdef SWORD2_DEBUG
-	bool _renderSkip;
-	bool _stepOneCycle;
-#endif
-
 #if RIGHT_CLICK_CLEARS_LUGGAGE
 	bool heldIsInInventory();
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.