libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-25 04:01:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TOON: Coding guideline corrections.

Browse Source 
svn-id: r53132
This commit is contained in:
Johannes Schickel 2010-10-10 21:26:18 +00:00
parent 0c6c03bfd6
commit 85f770599f
3 changed files with 70 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/toon/audio.cpp
View File

@ -426,7 +426,7 @@ AudioStreamPackage::AudioStreamPackage(ToonEngine *vm) : _vm(vm) {
}
AudioStreamPackage::~AudioStreamPackage() {
delete [] _indexBuffer;
delete[] _indexBuffer;
}
bool AudioStreamPackage::loadAudioPackage(Common::String indexFile, Common::String streamFile) {

133
engines/toon/toon.cpp
View File

@ -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];
}

2
engines/toon/toon.h
View File

@ -183,7 +183,7 @@ public:
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() {