[Scummvm-cvs-logs] SF.net SVN: scummvm:[53132] scummvm/trunk/engines/toon

[lordhoto at users.sourceforge.net]

Revision: 53132
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53132&view=rev
Author:   lordhoto
Date:     2010-10-10 21:26:18 +0000 (Sun, 10 Oct 2010)

Log Message:
-----------
TOON: Coding guideline corrections.

Modified Paths:
--------------
    scummvm/trunk/engines/toon/audio.cpp
    scummvm/trunk/engines/toon/toon.cpp
    scummvm/trunk/engines/toon/toon.h

Modified: scummvm/trunk/engines/toon/audio.cpp
===================================================================
--- scummvm/trunk/engines/toon/audio.cpp	2010-10-10 21:19:40 UTC (rev 53131)
+++ scummvm/trunk/engines/toon/audio.cpp	2010-10-10 21:26:18 UTC (rev 53132)
@@ -426,7 +426,7 @@
 }
 
 AudioStreamPackage::~AudioStreamPackage() {
-	delete [] _indexBuffer;
+	delete[] _indexBuffer;
 }
 
 bool AudioStreamPackage::loadAudioPackage(Common::String indexFile, Common::String streamFile) {

Modified: scummvm/trunk/engines/toon/toon.cpp
===================================================================
--- scummvm/trunk/engines/toon/toon.cpp	2010-10-10 21:19:40 UTC (rev 53131)
+++ scummvm/trunk/engines/toon/toon.cpp	2010-10-10 21:26:18 UTC (rev 53132)
@@ -2980,71 +2980,74 @@
 	flushPalette();
 }
 
-const char* ToonEngine::getSpecialConversationMusic(int32 conversationId) {
-	const char* specialMusic[] = {	"BR091013", "BR091013",
-									0, 0,
-									"NET1214", "NET1214",
-									0, 0,
-									"CAR1365B", "CAR1365B",
-									0, 0,
-									0, 0,
-									"CAR14431", "CAR14431",
-									0, 0,
-									"SCD16520", "SCD16520",
-									"SCD16520", "SCD16520",
-									"SCD16522", "SCD16522",
-									0, 0,
-									"KPM8719", "KPM8719",
-									0, 0,
-									"CAR1368B", "CAR1368B",
-									0, 0,
-									0, 0,
-									"KPM6337", "KPM6337",
-									"CAR20471", "CAR20471",
-									"CAR136_1", "KPM87_57",
-									0, 0,
-									"CAR13648", "CAR13648",
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									"SCD16526", "SCD16526",
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0,
-									0, 0 };
+const char *ToonEngine::getSpecialConversationMusic(int32 conversationId) {
+	static const char * const specialMusic[] = {
+		"BR091013", "BR091013",
+		0, 0,
+		"NET1214", "NET1214",
+		0, 0,
+		"CAR1365B", "CAR1365B",
+		0, 0,
+		0, 0,
+		"CAR14431", "CAR14431",
+		0, 0,
+		"SCD16520", "SCD16520",
+		"SCD16520", "SCD16520",
+		"SCD16522", "SCD16522",
+		0, 0,
+		"KPM8719", "KPM8719",
+		0, 0,
+		"CAR1368B", "CAR1368B",
+		0, 0,
+		0, 0,
+		"KPM6337", "KPM6337",
+		"CAR20471", "CAR20471",
+		"CAR136_1", "KPM87_57",
+		0, 0,
+		"CAR13648", "CAR13648",
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		"SCD16526", "SCD16526",
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0,
+		0, 0
+	};
+
 	return specialMusic[randRange(0, 1) + conversationId * 2];
 }
 

Modified: scummvm/trunk/engines/toon/toon.h
===================================================================
--- scummvm/trunk/engines/toon/toon.h	2010-10-10 21:19:40 UTC (rev 53131)
+++ scummvm/trunk/engines/toon/toon.h	2010-10-10 21:26:18 UTC (rev 53132)
@@ -183,7 +183,7 @@
 	virtual void viewInventoryItem(Common::String str, int32 lineId, int32 itemDest);
 	virtual void storePalette();
 	virtual void restorePalette();
-	virtual const char* getSpecialConversationMusic(int32 locationId); 
+	virtual const char *getSpecialConversationMusic(int32 locationId); 
 	virtual void playRoomMusic();
 
 	Resources *resources() {


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