[Scummvm-cvs-logs] SF.net SVN: scummvm:[52136] scummvm/trunk/engines/gob

strangerke at users.sourceforge.net strangerke at users.sourceforge.net
Tue Aug 17 10:33:51 CEST 2010


Revision: 52136
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52136&view=rev
Author:   strangerke
Date:     2010-08-17 08:33:50 +0000 (Tue, 17 Aug 2010)

Log Message:
-----------
Gob - Clean up: suppress blanks and tabs present at the end of line

Modified Paths:
--------------
    scummvm/trunk/engines/gob/hotspots.cpp
    scummvm/trunk/engines/gob/hotspots.h
    scummvm/trunk/engines/gob/init_fascin.cpp
    scummvm/trunk/engines/gob/init_v3.cpp

Modified: scummvm/trunk/engines/gob/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/gob/hotspots.cpp	2010-08-17 07:41:15 UTC (rev 52135)
+++ scummvm/trunk/engines/gob/hotspots.cpp	2010-08-17 08:33:50 UTC (rev 52136)
@@ -1393,9 +1393,9 @@
 		ids[i] = _vm->_game->_script->readInt16();
 		flags  = _vm->_game->_script->readInt16();
 
-		if (flags > 3) 
+		if (flags > 3)
 			warning("evaluateNew: Warning, use of type 2 or 20. flags = %d, should be %d\n", flags, flags&3);
-		
+
 		funcEnter = 0;
 
 		funcLeave = _vm->_game->_script->pos();
@@ -1424,7 +1424,7 @@
 }
 
 bool Hotspots::evaluateFind(uint16 key, int16 timeVal, const uint16 *ids,
-		uint16 leaveWindowIndex, uint16 hotspotIndex1, uint16 hotspotIndex2, 
+		uint16 leaveWindowIndex, uint16 hotspotIndex1, uint16 hotspotIndex2,
 		uint16 endIndex, int16 &duration, uint16 &id, uint16 &index, bool &finished) {
 
 	bool fascinCheck = false;
@@ -1678,7 +1678,7 @@
 			cursor = 0;
 			for (int i = 0; (i < kHotspotCount) && !_hotspots[i].isEnd(); i++) {
 				const Hotspot &spot = _hotspots[i];
-				// this check is /really/ Fascination specific. 
+				// this check is /really/ Fascination specific.
 				// It's illogical, so if it's to be reused in Adi games... Be careful!
 				if ((spot.flags & 0xFF00) == curType)
 					if (spot.isIn(x - deltax, y - deltay)) {

Modified: scummvm/trunk/engines/gob/hotspots.h
===================================================================
--- scummvm/trunk/engines/gob/hotspots.h	2010-08-17 07:41:15 UTC (rev 52135)
+++ scummvm/trunk/engines/gob/hotspots.h	2010-08-17 08:33:50 UTC (rev 52136)
@@ -224,7 +224,7 @@
 			uint16 &inputId, bool &hasInput, uint16 &inputCount);
 	/** Find the hotspot requested by script commands. */
 	bool evaluateFind(uint16 key, int16 timeVal, const uint16 *ids,
-			uint16 leaveWindowIndex, uint16 hotspotIndex1, uint16 hotspotIndex2, 
+			uint16 leaveWindowIndex, uint16 hotspotIndex1, uint16 hotspotIndex2,
 			uint16 endIndex, int16 &duration, uint16 &id, uint16 &index, bool &finished);
 
 	// Finding specific hotspots

Modified: scummvm/trunk/engines/gob/init_fascin.cpp
===================================================================
--- scummvm/trunk/engines/gob/init_fascin.cpp	2010-08-17 07:41:15 UTC (rev 52135)
+++ scummvm/trunk/engines/gob/init_fascin.cpp	2010-08-17 08:33:50 UTC (rev 52136)
@@ -41,8 +41,8 @@
 void Init_Fascination::updateConfig() {
 // In Fascination, some empty texts are present and used to clean up the text area.
 // Using _doSubtitles does the trick.
-// The first obvious example is in the hotel hall: 'Use ...' is displayed at the same 
-// place than the character dialogs. 
+// The first obvious example is in the hotel hall: 'Use ...' is displayed at the same
+// place than the character dialogs.
 	_vm->_global->_doSubtitles = true;
 }
 

Modified: scummvm/trunk/engines/gob/init_v3.cpp
===================================================================
--- scummvm/trunk/engines/gob/init_v3.cpp	2010-08-17 07:41:15 UTC (rev 52135)
+++ scummvm/trunk/engines/gob/init_v3.cpp	2010-08-17 08:33:50 UTC (rev 52136)
@@ -39,7 +39,7 @@
 }
 
 void Init_v3::updateConfig() {
-// In the CD version of Goblins3, some texts are flagged 'subtitles' 
+// In the CD version of Goblins3, some texts are flagged 'subtitles'
 // incorrectly and therefore should be displayed in all cases.
 // The first obvious example is just after Death level.
 	if ((_vm->getGameType() == kGameTypeGob3) && _vm->isCD())


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