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

[lordhoto at users.sourceforge.net]

Revision: 35999
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35999&view=rev
Author:   lordhoto
Date:     2009-01-22 16:56:22 +0000 (Thu, 22 Jan 2009)

Log Message:
-----------
Minor cleanup (got rid of a dynamic array).

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/lol.cpp
    scummvm/trunk/engines/kyra/lol.h
    scummvm/trunk/engines/kyra/scene_lol.cpp

Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp	2009-01-22 15:53:05 UTC (rev 35998)
+++ scummvm/trunk/engines/kyra/lol.cpp	2009-01-22 16:56:22 UTC (rev 35999)
@@ -238,7 +238,6 @@
 	delete[] _levelBlockProperties;
 	delete[] _lvl415;
 
-	delete[] _lvlShpHeader;
 	delete[] _levelFileData;
 	delete[] _vcnExpTable;
 	delete[] _vcnBlocks;
@@ -343,7 +342,6 @@
 	memset(_gameFlags, 0, 15 * sizeof(uint16));
 	memset(_unkEMC46, 0, 16 * sizeof(uint16));	
 
-	_lvlShpHeader = 0;
 	_levelFileData = 0;
 	_lvlShpFileHandle = 0;
 

Modified: scummvm/trunk/engines/kyra/lol.h
===================================================================
--- scummvm/trunk/engines/kyra/lol.h	2009-01-22 15:53:05 UTC (rev 35998)
+++ scummvm/trunk/engines/kyra/lol.h	2009-01-22 16:56:22 UTC (rev 35999)
@@ -550,7 +550,6 @@
 	
 	Common::SeekableReadStream *_lvlShpFileHandle;
 	uint16 _lvlShpNum;
-	uint32 *_lvlShpHeader;
 	uint16 _levelFileDataSize;
 	LevelShapeProperty *_levelFileData;
 

Modified: scummvm/trunk/engines/kyra/scene_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_lol.cpp	2009-01-22 15:53:05 UTC (rev 35998)
+++ scummvm/trunk/engines/kyra/scene_lol.cpp	2009-01-22 16:56:22 UTC (rev 35999)
@@ -345,14 +345,15 @@
 	if (_lvlShpNum <= shapeIndex)
 		return 0;
 
-	uint32 offs = _lvlShpHeader[shapeIndex] + 2;
-	_lvlShpFileHandle->seek(offs, 0);
+	_lvlShpFileHandle->seek(shapeIndex * 4 + 2, SEEK_SET);
+	uint32 offs = _lvlShpFileHandle->readUint32LE() + 2;
+	_lvlShpFileHandle->seek(offs, SEEK_SET);
 
 	uint8 tmp[16];
 	_lvlShpFileHandle->read(tmp, 16);
 	uint16 size = _screen->getShapeSize(tmp);
 
-	_lvlShpFileHandle->seek(offs, 0);
+	_lvlShpFileHandle->seek(offs, SEEK_SET);
 	uint8 *res = new uint8[size];
 	_lvlShpFileHandle->read(res, size);
 	
@@ -554,10 +555,6 @@
 
 	_lvlShpFileHandle = _res->getFileStream(shpFile);
 	_lvlShpNum = _lvlShpFileHandle->readUint16LE();
-	delete[] _lvlShpHeader;
-	_lvlShpHeader = new uint32[_lvlShpNum];
-	for (int i = 0; i < _lvlShpNum; i++)
-		_lvlShpHeader[i] = _lvlShpFileHandle->readUint32LE();
 
 	Common::SeekableReadStream *s = _res->getFileStream(datFile);
 


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