[Scummvm-cvs-logs] SF.net SVN: scummvm:[55088] scummvm/trunk/engines/hugo

strangerke at users.sourceforge.net strangerke at users.sourceforge.net
Sun Jan 2 00:57:50 CET 2011


Revision: 55088
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55088&view=rev
Author:   strangerke
Date:     2011-01-01 23:57:50 +0000 (Sat, 01 Jan 2011)

Log Message:
-----------
HUGO: Some space/tab cleanups

Modified Paths:
--------------
    scummvm/trunk/engines/hugo/display.cpp
    scummvm/trunk/engines/hugo/game.h
    scummvm/trunk/engines/hugo/hugo.h
    scummvm/trunk/engines/hugo/object_v2d.cpp
    scummvm/trunk/engines/hugo/schedule.cpp
    scummvm/trunk/engines/hugo/sound.cpp

Modified: scummvm/trunk/engines/hugo/display.cpp
===================================================================
--- scummvm/trunk/engines/hugo/display.cpp	2011-01-01 22:36:33 UTC (rev 55087)
+++ scummvm/trunk/engines/hugo/display.cpp	2011-01-01 23:57:50 UTC (rev 55088)
@@ -435,7 +435,7 @@
 }
 
 /**
-* Introduce user to the game. In the original games, it was only 
+* Introduce user to the game. In the original games, it was only
 * present in the DOS versions
 */
 void Screen::userHelp() {

Modified: scummvm/trunk/engines/hugo/game.h
===================================================================
--- scummvm/trunk/engines/hugo/game.h	2011-01-01 22:36:33 UTC (rev 55087)
+++ scummvm/trunk/engines/hugo/game.h	2011-01-01 23:57:50 UTC (rev 55088)
@@ -42,7 +42,7 @@
 
 namespace Hugo {
 
-// WARNING!!  
+// WARNING!!
 // Type "PPG" in the game to enter cheat mode.
 
 #define COPYRIGHT   "Copyright 1989-1997 David P Gray, All Rights Reserved."

Modified: scummvm/trunk/engines/hugo/hugo.h
===================================================================
--- scummvm/trunk/engines/hugo/hugo.h	2011-01-01 22:36:33 UTC (rev 55087)
+++ scummvm/trunk/engines/hugo/hugo.h	2011-01-01 23:57:50 UTC (rev 55088)
@@ -128,7 +128,7 @@
 	int8   _soundTest;
 	int8   _tunesNbr;
 	uint16 _numScreens;
-	int8   _normalTPS;                              // Number of ticks (frames) per second. 
+	int8   _normalTPS;                              // Number of ticks (frames) per second.
 	                                                //8 for Win versions, 9 for DOS versions
 
 
@@ -258,7 +258,6 @@
 		return _introXSize;
 	}
 	Common::Error saveGameState(int slot, const char *desc) {
-		
 		return (_file->saveGame(slot, desc) ? Common::kWritingFailed : Common::kNoError);
 	}
 

Modified: scummvm/trunk/engines/hugo/object_v2d.cpp
===================================================================
--- scummvm/trunk/engines/hugo/object_v2d.cpp	2011-01-01 22:36:33 UTC (rev 55087)
+++ scummvm/trunk/engines/hugo/object_v2d.cpp	2011-01-01 23:57:50 UTC (rev 55088)
@@ -52,7 +52,7 @@
 ObjectHandler_v2d::~ObjectHandler_v2d() {
 }
 
-/** 
+/**
 * Draw all objects on screen as follows:
 * 1. Sort 'FLOATING' objects in order of y2 (base of object)
 * 2. Display new object frames/positions in dib

Modified: scummvm/trunk/engines/hugo/schedule.cpp
===================================================================
--- scummvm/trunk/engines/hugo/schedule.cpp	2011-01-01 22:36:33 UTC (rev 55087)
+++ scummvm/trunk/engines/hugo/schedule.cpp	2011-01-01 23:57:50 UTC (rev 55088)
@@ -133,7 +133,7 @@
 	if (!updateFl)
 		return(tick);
 
-	if (t_old == 0) 
+	if (t_old == 0)
 		t_old = (uint32) floor((double) (g_system->getMillis() * _vm->getTPS() / 1000));
 	/* Calculate current wall time in ticks */
 	t_now = g_system->getMillis() * _vm->getTPS() / 1000	;

Modified: scummvm/trunk/engines/hugo/sound.cpp
===================================================================
--- scummvm/trunk/engines/hugo/sound.cpp	2011-01-01 22:36:33 UTC (rev 55087)
+++ scummvm/trunk/engines/hugo/sound.cpp	2011-01-01 23:57:50 UTC (rev 55088)
@@ -153,7 +153,7 @@
 	if (ret)
 		return ret;
 
-    _driver->sendGMReset();
+	_driver->sendGMReset();
 
 	_parser = MidiParser::createParser_SMF();
 	_parser->setMidiDriver(this);
@@ -185,10 +185,10 @@
 		_channelsVolume[ch] = volume;
 		volume = volume * _masterVolume / 255;
 		b = (b & 0xFF00FFFF) | (volume << 16);
-        debugC(8, kDebugMusic, "Volume change, channel %d volume %d", ch, volume);
+		debugC(8, kDebugMusic, "Volume change, channel %d volume %d", ch, volume);
 		break;
 	case 0x7BB0:                                    // all notes off
-        debugC(8, kDebugMusic, "All notes off, channel %d", ch);
+		debugC(8, kDebugMusic, "All notes off, channel %d", ch);
 		if (!_channelsTable[ch]) {                  // channel not yet allocated, no need to send the event
 			return;
 		}
@@ -302,23 +302,23 @@
 	sound_pt sound_p;                               // Sound data
 	uint16 size;                                    // Size of data
 	static byte curPriority = 0;                    // Priority of currently playing sound
-	//
-	/* Sound disabled */
+
+	// Sound disabled
 	if (!_config.soundFl || !_vm->_mixer->isReady())
 		return;
-	
+
 	syncVolume();
-	
+
 	//
-	// // See if last wave still playing - if so, check priority
+	// See if last wave still playing - if so, check priority
 	// if (waveOutUnprepareHeader(hwav, lphdr, sizeof(WAVEHDR)) == WAVERR_STILLPLAYING)
-	//  if (priority < curPriority)                 // Don't override unless priority >= current
-	//      return;
-	//  else
-	//      Stop_sound();
+	//    if (priority < curPriority)                 // Don't override unless priority >= current
+	//       return;
+	//    else
+	//       Stop_sound();
 	curPriority = priority;
-	//
-	/* Get sound data */
+
+	// Get sound data
 	if ((sound_p = _vm->_file->getSound(sound, &size)) == 0)
 		return;
 
@@ -355,7 +355,7 @@
 
 	for (int i = 0; _vm->_defltTunes[i] != -1; i++) {
 		if (_vm->_defltTunes[i] == _vm->getGameStatus().song) {
-			if (_vm->_defltTunes[i + 1] != -1) 
+			if (_vm->_defltTunes[i + 1] != -1)
 				playMusic(_vm->_defltTunes[i + 1]);
 			else
 				playMusic(_vm->_defltTunes[0]);


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




More information about the Scummvm-git-logs mailing list