diff options
| author | Eugene Sandulenko | 2011-06-22 10:41:38 +0300 | 
|---|---|---|
| committer | Eugene Sandulenko | 2011-06-22 10:41:38 +0300 | 
| commit | 1fe9985912c3bb819d1145b03389a615f9b11401 (patch) | |
| tree | ba76db1c949efd9949361c4ec1fdbf63a2abc0a5 | |
| parent | c288d6d20729563c6ce3416fd641947a35562469 (diff) | |
| download | scummvm-rg350-1fe9985912c3bb819d1145b03389a615f9b11401.tar.gz scummvm-rg350-1fe9985912c3bb819d1145b03389a615f9b11401.tar.bz2 scummvm-rg350-1fe9985912c3bb819d1145b03389a615f9b11401.zip | |
LASTEXPRESS: Named several soundEntry structure members
| -rw-r--r-- | engines/lastexpress/game/sound.cpp | 10 | ||||
| -rw-r--r-- | engines/lastexpress/game/sound.h | 16 | 
2 files changed, 13 insertions, 13 deletions
| diff --git a/engines/lastexpress/game/sound.cpp b/engines/lastexpress/game/sound.cpp index b8d2755907..4779fc532f 100644 --- a/engines/lastexpress/game/sound.cpp +++ b/engines/lastexpress/game/sound.cpp @@ -614,16 +614,16 @@ void SoundManager::saveLoadWithSerializer(Common::Serializer &s) {  			if (entry->name2.matchString("NISSND?") && (entry->status.status & kFlagType7) != kFlag3) {  				s.syncAsUint32LE(entry->status.status); // status;  				s.syncAsUint32LE(entry->type); // type; -				s.syncAsUint32LE(entry->field_1C); // field_8; +				s.syncAsUint32LE(entry->blockCount); // field_8;  				s.syncAsUint32LE(entry->time); // time;  				s.syncAsUint32LE(entry->field_34); // field_10;  				s.syncAsUint32LE(entry->field_38); // field_14;  				s.syncAsUint32LE(entry->entity); // entity; -				uint32 field_1C = (uint32)entry->field_48 - _data2; -				if (field_1C > kFlag8) -					field_1C = 0; -				s.syncAsUint32LE(field_1C); // field_1C; +				uint32 blockCount = (uint32)entry->field_48 - _data2; +				if (blockCount > kFlag8) +					blockCount = 0; +				s.syncAsUint32LE(blockCount); // blockCount;  				s.syncAsUint32LE(entry->field_4C); // field_20; diff --git a/engines/lastexpress/game/sound.h b/engines/lastexpress/game/sound.h index 5b1fe64cd8..839c868813 100644 --- a/engines/lastexpress/game/sound.h +++ b/engines/lastexpress/game/sound.h @@ -246,14 +246,14 @@ private:  	struct SoundEntry {  		SoundStatusUnion status;  		SoundType type;    // int -		//int field_8; -		//int field_C; -		int processedFrameCount; +		//int data; +		//int endOffset; +		int currentDataPtr;  		void *soundData; -		//int field_18; -		int field_1C; +		//int currentBufferPtr; +		int blockCount;  		uint32 time; -		//int field_24; +		//int size;  		//int field_28;  		Common::SeekableReadStream *stream;	// int  		//int field_30; @@ -276,10 +276,10 @@ private:  			status.status = 0;  			type = kSoundTypeNone; -			processedFrameCount = 0; +			currentDataPtr = 0;  			soundData = NULL; -			field_1C = 0; +			blockCount = 0;  			time = 0;  			stream = NULL; | 
