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

[lordhoto at users.sourceforge.net]

Revision: 35906
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35906&view=rev
Author:   lordhoto
Date:     2009-01-18 17:31:25 +0000 (Sun, 18 Jan 2009)

Log Message:
-----------
- Fixed some delete[] misuse
- Fixed regression introduced with r35904

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

Modified: scummvm/trunk/engines/kyra/scene_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_lol.cpp	2009-01-18 17:24:47 UTC (rev 35905)
+++ scummvm/trunk/engines/kyra/scene_lol.cpp	2009-01-18 17:31:25 UTC (rev 35906)
@@ -261,7 +261,7 @@
 
 void LoLEngine::loadLevelWLL(int index, bool mapShapes) {
 	char filename[16];
-	sprintf(filename, "level%2d.wll", index);
+	sprintf(filename, "level%d.wll", index);
 
 	uint32 size;
 	uint8 *file = _res->fileData(filename, &size);
@@ -569,7 +569,7 @@
 		l->flags = s->readByte();
 	}
 
-	delete []s;
+	delete s;
 
 	if (!flag) {
 		_lvlBlockIndex = 1;
@@ -669,11 +669,11 @@
 	_screen->generateBrightnessPalette(_screen->_currentPalette, _screen->getPalette(1), _brightness, _lampOilStatus);
 
 	char tname[16];
-	sprintf(tname, "LEVEL%2d.TLC", _currentLevel);
+	sprintf(tname, "LEVEL%.02d.TLC", _currentLevel);
 	Common::SeekableReadStream *s = _res->getFileStream(tname);
 	s->read(_tlcTable1, 256);
 	s->read(_tlcTable2, 5120);
-	delete []s;
+	delete s;
 
 	_loadSuppFilesFlag = 1;
 }


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