diff options
author | Johannes Schickel | 2010-10-10 21:26:18 +0000 |
---|---|---|
committer | Johannes Schickel | 2010-10-10 21:26:18 +0000 |
commit | 85f770599fe6eb7df8efe105d70538e261b835b6 (patch) | |
tree | cf89f844debd96ee770ed0fab642f0c79a2e187b /engines/toon/toon.cpp | |
parent | 0c6c03bfd6ed0d85564c5b074f38095c2b796245 (diff) | |
download | scummvm-rg350-85f770599fe6eb7df8efe105d70538e261b835b6.tar.gz scummvm-rg350-85f770599fe6eb7df8efe105d70538e261b835b6.tar.bz2 scummvm-rg350-85f770599fe6eb7df8efe105d70538e261b835b6.zip |
TOON: Coding guideline corrections.
svn-id: r53132
Diffstat (limited to 'engines/toon/toon.cpp')
-rw-r--r-- | engines/toon/toon.cpp | 133 |
1 files changed, 68 insertions, 65 deletions
diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp index cfbb6bfe6f..53008b42d4 100644 --- a/engines/toon/toon.cpp +++ b/engines/toon/toon.cpp @@ -2980,71 +2980,74 @@ void ToonEngine::restorePalette() { 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]; } |