[Scummvm-cvs-logs] SF.net SVN: scummvm:[40200] scummvm/trunk/engines/kyra/sound_adlib.cpp

[lordhoto at users.sourceforge.net]

Revision: 40200
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40200&view=rev
Author:   lordhoto
Date:     2009-04-29 11:50:13 +0000 (Wed, 29 Apr 2009)

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sound_adlib.cpp

Modified: scummvm/trunk/engines/kyra/sound_adlib.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_adlib.cpp	2009-04-29 11:34:23 UTC (rev 40199)
+++ scummvm/trunk/engines/kyra/sound_adlib.cpp	2009-04-29 11:50:13 UTC (rev 40200)
@@ -2375,10 +2375,10 @@
 	if (_soundDataPtr)
 		haltTrack();
 
-	uint8 *file_data = 0; uint32 file_size = 0;
+	uint8 *fileData = 0; uint32 fileSize = 0;
 
-	file_data = _vm->resource()->fileData(file.c_str(), &file_size);
-	if (!file_data) {
+	fileData = _vm->resource()->fileData(file.c_str(), &fileSize);
+	if (!fileData) {
 		warning("Couldn't find music file: '%s'", file.c_str());
 		return;
 	}
@@ -2389,8 +2389,8 @@
 	_driver->callback(8, int(-1));
 	_soundDataPtr = 0;
 
-	int soundDataSize = file_size;
-	uint8 *p = file_data;
+	int soundDataSize = fileSize;
+	uint8 *p = fileData;
 
 	if (_v2) {
 		memcpy(_trackEntries, p, 500);
@@ -2407,9 +2407,9 @@
 
 	memcpy(_soundDataPtr, p, soundDataSize*sizeof(uint8));
 
-	delete[] file_data;
-	file_data = p = 0;
-	file_size = 0;
+	delete[] fileData;
+	fileData = p = 0;
+	fileSize = 0;
 
 	_driver->callback(4, _soundDataPtr);
 


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