[Scummvm-cvs-logs] SF.net SVN: scummvm: [28042] scummvm/trunk/engines/saga

[thebluegr at users.sourceforge.net]

Revision: 28042
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28042&view=rev
Author:   thebluegr
Date:     2007-07-12 01:52:07 -0700 (Thu, 12 Jul 2007)

Log Message:
-----------
Renamed a variable, so that it makes more sense

Modified Paths:
--------------
    scummvm/trunk/engines/saga/music.cpp
    scummvm/trunk/engines/saga/music.h

Modified: scummvm/trunk/engines/saga/music.cpp
===================================================================
--- scummvm/trunk/engines/saga/music.cpp	2007-07-12 06:36:53 UTC (rev 28041)
+++ scummvm/trunk/engines/saga/music.cpp	2007-07-12 08:52:07 UTC (rev 28042)
@@ -282,7 +282,7 @@
 	xmidiParser = MidiParser::createParser_XMIDI();
 	smfParser = MidiParser::createParser_SMF();	
 
-	_musicContext = _vm->_resource->getContext(GAME_MUSICFILE);
+	_digitalMusicContext = _vm->_resource->getContext(GAME_MUSICFILE);
 
 	_songTableLen = 0;
 	_songTable = 0;
@@ -405,7 +405,7 @@
 
 	if (_vm->getGameType() == GType_ITE) {
 		if (resourceId >= 9 && resourceId <= 34) {
-			if (_musicContext != NULL) {
+			if (_digitalMusicContext != NULL) {
 				//TODO: check resource size
 				loopStart = 0;
 				// fix ITE sunstatm score
@@ -415,7 +415,7 @@
 
 				if (!(_vm->getFeatures() & GF_COMPRESSED_SOUNDS)) {
 					// uncompressed digital music
-					audioStream = new RAWInputStream(_vm, _musicContext, resourceId - 9, flags == MUSIC_LOOP, loopStart);
+					audioStream = new RAWInputStream(_vm, _digitalMusicContext, resourceId - 9, flags == MUSIC_LOOP, loopStart);
 				} else {
 					// compressed digital music
 					ResourceData * musicResourceData;
@@ -423,8 +423,8 @@
 					byte compressedHeader[10];
 					GameSoundTypes soundType;
 
-					musicResourceData = _vm->_resource->getResourceData(_musicContext, resourceId - 9);
-					_file = _musicContext->getFile(musicResourceData);
+					musicResourceData = _vm->_resource->getResourceData(_digitalMusicContext, resourceId - 9);
+					_file = _digitalMusicContext->getFile(musicResourceData);
 
 					if (_vm->getMusicInfo() == NULL) {
 						error("RAWInputStream() wrong musicInfo");

Modified: scummvm/trunk/engines/saga/music.h
===================================================================
--- scummvm/trunk/engines/saga/music.h	2007-07-12 06:36:53 UTC (rev 28041)
+++ scummvm/trunk/engines/saga/music.h	2007-07-12 08:52:07 UTC (rev 28042)
@@ -137,7 +137,7 @@
 	int _currentVolume;
 	int _currentVolumePercent;
 
-	ResourceContext *_musicContext;
+	ResourceContext *_digitalMusicContext;
 	MidiParser *xmidiParser;
 	MidiParser *smfParser;
 


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