diff options
Diffstat (limited to 'engines/startrek/intro.cpp')
| -rw-r--r-- | engines/startrek/intro.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/startrek/intro.cpp b/engines/startrek/intro.cpp index dd791cb747..26f23557f9 100644 --- a/engines/startrek/intro.cpp +++ b/engines/startrek/intro.cpp @@ -40,7 +40,6 @@ void StarTrekEngine::playIntro() { planetR3.field1e = 3; planetR3.funcPtr1 = 0; planetR3.funcPtr2 = 0; - planetR3.bitmapOffset = 0; _gfx->clearScreenAndPriBuffer(); _gfx->fadeoutScreen(); @@ -57,7 +56,7 @@ void StarTrekEngine::playIntro() { Sprite subtitleSprite; _gfx->addSprite(&subtitleSprite); subtitleSprite.setXYAndPriority(0, 0, 12); - subtitleSprite.setBitmap(_gfx->loadBitmap("blank")); + subtitleSprite.setBitmap(loadBitmapFile("blank")); subtitleSprite.drawPriority2 = 16; int index = 12; @@ -151,7 +150,7 @@ void StarTrekEngine::playIntro() { loadSubtitleSprite(2, &subtitleSprite); planetR3.field22 = 2000; planetR3.field24 = 10000 / _starfieldPointDivisor; - planetR3.shpFile = SharedPtr<Common::MemoryReadStreamEndian>(loadFile("planet.shp")); + planetR3.bitmap = new Bitmap(loadFile("planet.shp")); initIntroR3ObjectToMove(&planetR3, 6, 10000, 6, 10000, 0); addR3(&planetR3); initIntroR3ObjectToMove(&_enterpriseR3, -15, 250, 15, 500, 18); @@ -164,7 +163,8 @@ void StarTrekEngine::playIntro() { break; case 366: - planetR3.shpFile.reset(); + delete planetR3.bitmap; + planetR3.bitmap = nullptr; delR3(&planetR3); break; @@ -232,10 +232,10 @@ void StarTrekEngine::initIntroR3ObjectToMove(R3 *r3, int16 srcAngle, int16 srcDe void StarTrekEngine::loadSubtitleSprite(int index, Sprite *sprite) { if (_showSubtitles) { if (index == -1) - sprite->setBitmap(_gfx->loadBitmap("blank")); + sprite->setBitmap(loadBitmapFile("blank")); else { Common::String file = Common::String::format("tittxt%02d", index); - sprite->setBitmap(_gfx->loadBitmap(file)); + sprite->setBitmap(loadBitmapFile(file)); } } } |