[Scummvm-cvs-logs] SF.net SVN: scummvm:[42604] scummvm/branches/gsoc2009-mods
nolange at users.sourceforge.net
nolange at users.sourceforge.net
Sun Jul 19 03:14:51 CEST 2009
Revision: 42604
http://scummvm.svn.sourceforge.net/scummvm/?rev=42604&view=rev
Author: nolange
Date: 2009-07-19 01:14:51 +0000 (Sun, 19 Jul 2009)
Log Message:
-----------
fixed: intro-music started twice because it was hardcoded in the engine
removed verbose debug-output from maxtrax
Modified Paths:
--------------
scummvm/branches/gsoc2009-mods/engines/kyra/sequences_lok.cpp
scummvm/branches/gsoc2009-mods/sound/mods/maxtrax.cpp
Modified: scummvm/branches/gsoc2009-mods/engines/kyra/sequences_lok.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/kyra/sequences_lok.cpp 2009-07-19 01:05:18 UTC (rev 42603)
+++ scummvm/branches/gsoc2009-mods/engines/kyra/sequences_lok.cpp 2009-07-19 01:14:51 UTC (rev 42604)
@@ -109,7 +109,7 @@
_seq->setCopyViewOffs(true);
_screen->setFont(Screen::FID_8_FNT);
- if (_flags.platform != Common::kPlatformFMTowns && _flags.platform != Common::kPlatformPC98)
+ if (_flags.platform != Common::kPlatformFMTowns && _flags.platform != Common::kPlatformPC98 && _flags.platform != Common::kPlatformAmiga)
snd_playTheme(0, 2);
_text->setTalkCoords(144);
Modified: scummvm/branches/gsoc2009-mods/sound/mods/maxtrax.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/sound/mods/maxtrax.cpp 2009-07-19 01:05:18 UTC (rev 42603)
+++ scummvm/branches/gsoc2009-mods/sound/mods/maxtrax.cpp 2009-07-19 01:14:51 UTC (rev 42604)
@@ -625,7 +625,6 @@
_playerCtx.tempoInitial = songTempo;
_playerCtx.filterOn = (flags & 1) != 0;
_playerCtx.handleVolume = (flags & 2) != 0;
- debug("Header: MXTX %02X %02X", _playerCtx.tempo, flags);
}
if (flags & (1 << 15)) {
@@ -643,7 +642,6 @@
if (loadScores) {
const uint16 tempScores = MIN(scoresInFile, _playerCtx.maxScoreNum);
- debug("#Scores: %d, loading # of scores: %d", scoresInFile, tempScores);
Score *curScore =_scores = new Score[tempScores];
for (int i = tempScores; i > 0; --i, ++curScore) {
@@ -661,17 +659,13 @@
_numScores = scoresLoaded = tempScores;
}
- if (false && !loadSamples)
+ if (!loadSamples)
return true;
// skip over remaining scores in file
for (int i = scoresInFile - scoresLoaded; i > 0; --i)
musicData.skip(musicData.readUint32BE() * 6);
- for (int i = 0; i < _numScores; ++i)
- outPutScore(_scores[i], i);
-
- debug("samples start at filepos %08X", musicData.pos());
// uint16 number of Samples
const uint16 wavesInFile = musicData.readUint16BE();
if (loadSamples) {
@@ -694,7 +688,6 @@
curPatch.releaseLen = musicData.readUint16BE();
const uint32 totalEnvs = curPatch.attackLen + curPatch.releaseLen;
- debug("wave nr %d at %08X - %d octaves", number, musicData.pos(), curPatch.sampleOctaves);
// Allocate space for both attack and release Segment.
Envelope *envPtr = new Envelope[totalEnvs];
// Attack Segment
@@ -713,7 +706,7 @@
curPatch.samplePtr = allocSamples;
musicData.read(allocSamples, totalSamples);
}
- } else if (wavesInFile > 0){
+ } /* else if (wavesInFile > 0){ // only necessary if we need to consume the whole stream to point at end of data
uint32 skipLen = 3 * 2;
for (int i = wavesInFile; i > 0; --i) {
musicData.skip(skipLen);
@@ -722,15 +715,13 @@
const uint32 sustainLen = musicData.readUint32BE();
const uint16 attackCount = musicData.readUint16BE();
const uint16 releaseCount = musicData.readUint16BE();
- debug("wave nr %d at %08X", 0, musicData.pos());
skipLen = attackCount * 4 + releaseCount * 4
+ (attackLen + sustainLen) * ((1 << octaves) - 1)
+ 3 * 2;
}
musicData.skip(skipLen - 3 * 2);
- }
- debug("endpos %08X", musicData.pos());
+ } */
return res;
}
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