[Scummvm-cvs-logs] SF.net SVN: scummvm:[46735] scummvm/trunk/engines/mohawk

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Wed Dec 30 08:30:11 CET 2009


Revision: 46735
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46735&view=rev
Author:   eriktorbjorn
Date:     2009-12-30 07:30:04 +0000 (Wed, 30 Dec 2009)

Log Message:
-----------
Removed some unnecessary whitespace. Changed some spaces to tabs.

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/bitmap.cpp
    scummvm/trunk/engines/mohawk/file.cpp
    scummvm/trunk/engines/mohawk/myst_scripts.h
    scummvm/trunk/engines/mohawk/sound.cpp
    scummvm/trunk/engines/mohawk/sound.h

Modified: scummvm/trunk/engines/mohawk/bitmap.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/bitmap.cpp	2009-12-30 07:14:09 UTC (rev 46734)
+++ scummvm/trunk/engines/mohawk/bitmap.cpp	2009-12-30 07:30:04 UTC (rev 46735)
@@ -322,7 +322,7 @@
 static byte getLastTwoBits(byte c) {
 	return (c & 0x03);
 }
-        
+
 static byte getLastThreeBits(byte c) {
 	return (c & 0x07);
 }
@@ -408,8 +408,8 @@
 			B_LASTDUPLET();
 		} else if (cmd == 0x50) {
 			// Output two absolute pixel values, p1 and p2
-			B_BYTE();           
 			B_BYTE();
+			B_BYTE();
 		} else if (cmd >= 0x51 && cmd <= 0x57) {
 			// Output pixel at relative position -m, then absolute pixel value p
 			// m is the last 3 bits of cmd here, not last 4

Modified: scummvm/trunk/engines/mohawk/file.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/file.cpp	2009-12-30 07:14:09 UTC (rev 46734)
+++ scummvm/trunk/engines/mohawk/file.cpp	2009-12-30 07:30:04 UTC (rev 46735)
@@ -106,7 +106,7 @@
 		debug (3, "Resources = %04x", _types[i].resTable.resources);
 
 		_types[i].resTable.entries = new Type::ResourceTable::Entries[_types[i].resTable.resources];
-                        
+
 		for (uint16 j = 0; j < _types[i].resTable.resources; j++) {
 			_types[i].resTable.entries[j].id = _mhk->readUint16BE();
 			_types[i].resTable.entries[j].index = _mhk->readUint16BE();
@@ -121,7 +121,7 @@
 		debug (3, "Names = %04x", _types[i].nameTable.num);
 
 		_types[i].nameTable.entries = new Type::NameTable::Entries[_types[i].nameTable.num];
-                        
+
 		for (uint16 j = 0; j < _types[i].nameTable.num; j++) {
 			_types[i].nameTable.entries[j].offset = _mhk->readUint16BE();
 			_types[i].nameTable.entries[j].index = _mhk->readUint16BE();
@@ -152,7 +152,7 @@
 	_mhk->seek(_rsrc.abs_offset + _rsrc.file_table_offset);
 	_fileTableAmount = _mhk->readUint32BE();
 	_fileTable = new FileTable[_fileTableAmount];
-                
+
 	for (uint32 i = 0; i < _fileTableAmount; i++) {
 		_fileTable[i].offset = _mhk->readUint32BE();
 		_fileTable[i].dataSize = _mhk->readUint16BE();

Modified: scummvm/trunk/engines/mohawk/myst_scripts.h
===================================================================
--- scummvm/trunk/engines/mohawk/myst_scripts.h	2009-12-30 07:14:09 UTC (rev 46734)
+++ scummvm/trunk/engines/mohawk/myst_scripts.h	2009-12-30 07:30:04 UTC (rev 46735)
@@ -178,31 +178,31 @@
 	DECLARE_OPCODE(opcode_198);
 	DECLARE_OPCODE(opcode_199);
 
-    DECLARE_OPCODE(opcode_200);
-    DECLARE_OPCODE(opcode_201);
-    DECLARE_OPCODE(opcode_202);
-    DECLARE_OPCODE(opcode_203);
-    DECLARE_OPCODE(opcode_204);
-    DECLARE_OPCODE(opcode_205);
-    DECLARE_OPCODE(opcode_206);
-    DECLARE_OPCODE(opcode_207);
-    DECLARE_OPCODE(opcode_208);
-    DECLARE_OPCODE(opcode_209);
-    DECLARE_OPCODE(opcode_210);
-    DECLARE_OPCODE(opcode_211);
-    DECLARE_OPCODE(opcode_212);
-    DECLARE_OPCODE(opcode_213);
-    DECLARE_OPCODE(opcode_214);
-    DECLARE_OPCODE(opcode_215);
-    DECLARE_OPCODE(opcode_216);
-    DECLARE_OPCODE(opcode_217);
-    DECLARE_OPCODE(opcode_218);
-    DECLARE_OPCODE(opcode_219);
-    DECLARE_OPCODE(opcode_220);
-    DECLARE_OPCODE(opcode_221);
-    DECLARE_OPCODE(opcode_222);
-    DECLARE_OPCODE(opcode_298);
-    DECLARE_OPCODE(opcode_299);
+	DECLARE_OPCODE(opcode_200);
+	DECLARE_OPCODE(opcode_201);
+	DECLARE_OPCODE(opcode_202);
+	DECLARE_OPCODE(opcode_203);
+	DECLARE_OPCODE(opcode_204);
+	DECLARE_OPCODE(opcode_205);
+	DECLARE_OPCODE(opcode_206);
+	DECLARE_OPCODE(opcode_207);
+	DECLARE_OPCODE(opcode_208);
+	DECLARE_OPCODE(opcode_209);
+	DECLARE_OPCODE(opcode_210);
+	DECLARE_OPCODE(opcode_211);
+	DECLARE_OPCODE(opcode_212);
+	DECLARE_OPCODE(opcode_213);
+	DECLARE_OPCODE(opcode_214);
+	DECLARE_OPCODE(opcode_215);
+	DECLARE_OPCODE(opcode_216);
+	DECLARE_OPCODE(opcode_217);
+	DECLARE_OPCODE(opcode_218);
+	DECLARE_OPCODE(opcode_219);
+	DECLARE_OPCODE(opcode_220);
+	DECLARE_OPCODE(opcode_221);
+	DECLARE_OPCODE(opcode_222);
+	DECLARE_OPCODE(opcode_298);
+	DECLARE_OPCODE(opcode_299);
 
 	DECLARE_OPCODE(opcode_300);
 	DECLARE_OPCODE(opcode_301);

Modified: scummvm/trunk/engines/mohawk/sound.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/sound.cpp	2009-12-30 07:14:09 UTC (rev 46734)
+++ scummvm/trunk/engines/mohawk/sound.cpp	2009-12-30 07:30:04 UTC (rev 46735)
@@ -85,7 +85,7 @@
 	_midiParser->setMidiDriver(_midiDriver);
 	_midiParser->setTimerRate(_midiDriver->getBaseTempo());
 }
-        
+
 Audio::SoundHandle *Sound::playSound(uint16 id, bool mainSoundFile, byte volume) {
 	debug (0, "Playing sound %d", id);
 	

Modified: scummvm/trunk/engines/mohawk/sound.h
===================================================================
--- scummvm/trunk/engines/mohawk/sound.h	2009-12-30 07:14:09 UTC (rev 46734)
+++ scummvm/trunk/engines/mohawk/sound.h	2009-12-30 07:30:04 UTC (rev 46735)
@@ -131,7 +131,7 @@
 	void pauseSLST();
 	void resumeSLST();
 	void stopAllSLST();
-                
+
 private:
 	MohawkEngine *_vm;
 	MohawkFile *_rivenSoundFile;


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