aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/sequences_hof.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2009-11-21 23:44:52 +0000
committerJohannes Schickel2009-11-21 23:44:52 +0000
commita2b056c28802f1c69561dd22752f19e44173537e (patch)
tree5dd1df876bd4334da7307050dc26b103d944a3c2 /engines/kyra/sequences_hof.cpp
parented1c0fcde8c9e02e187b02caf8d30d9b17dc3150 (diff)
downloadscummvm-rg350-a2b056c28802f1c69561dd22752f19e44173537e.tar.gz
scummvm-rg350-a2b056c28802f1c69561dd22752f19e44173537e.tar.bz2
scummvm-rg350-a2b056c28802f1c69561dd22752f19e44173537e.zip
More cleanup.
svn-id: r46055
Diffstat (limited to 'engines/kyra/sequences_hof.cpp')
-rw-r--r--engines/kyra/sequences_hof.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/engines/kyra/sequences_hof.cpp b/engines/kyra/sequences_hof.cpp
index 47e3cc1290..c6ed21b0fa 100644
--- a/engines/kyra/sequences_hof.cpp
+++ b/engines/kyra/sequences_hof.cpp
@@ -2774,8 +2774,6 @@ void KyraEngine_HoF::seq_init() {
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 @@ void KyraEngine_HoF::seq_init() {
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 @@ void KyraEngine_HoF::seq_uninit() {
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);