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

[lordhoto at users.sourceforge.net]

Revision: 46055
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46055&view=rev
Author:   lordhoto
Date:     2009-11-21 23:44:52 +0000 (Sat, 21 Nov 2009)

Log Message:
-----------
More cleanup.

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

Modified: scummvm/trunk/engines/kyra/sequences_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_hof.cpp	2009-11-21 23:23:07 UTC (rev 46054)
+++ scummvm/trunk/engines/kyra/sequences_hof.cpp	2009-11-21 23:44:52 UTC (rev 46055)
@@ -2774,8 +2774,6 @@
 	if (_flags.platform == Common::kPlatformPC98)
 		_sound->loadSoundFile("sound.dat");
 
-	int numShp = -1;
-
 	_screen->setFont(_flags.lang == Common::JA_JPN ? Screen::FID_SJIS_FNT : Screen::FID_GOLDFONT_FNT);
 
 	if (_flags.gameID == GI_LOL)
@@ -2789,10 +2787,8 @@
 		Screen::decodeFrame4(shp + 10, _animShapeFiledata, outsize);
 		delete[] shp;
 
-		do {
-			numShp++;
+		for (int numShp = 0; getShapePtr(numShp); ++numShp)
 			addShapeToPool(_screen->getPtrToShape(_animShapeFiledata, numShp), numShp);
-		} while (getShapePtr(numShp));
 	} else {
 		const MainMenu::StaticData data = {
 			{ _sequenceStrings[97], _sequenceStrings[96], _sequenceStrings[95], _sequenceStrings[98], 0 },
@@ -2822,9 +2818,6 @@
 	delete[] _animShapeFiledata;
 	_animShapeFiledata = 0;
 
-	if (_flags.isDemo && !_flags.isTalkie)
-		_staticres->unloadId(k2SeqplayShapeAnimData);
-
 	delete _menu;
 	_menu = 0;
 	_screen->setFont(_flags.lang == Common::JA_JPN ? Screen::FID_SJIS_FNT : Screen::FID_8_FNT);


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