libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 09:23:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

STARTREK: Simplify setBackgroundImage()

Browse Source
This commit is contained in:
Filippos Karapetis 2019-12-27 14:36:38 +02:00
parent 9ebb737a06
commit da9bd9a102
8 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/startrek/awaymission.cpp
View File

@ -85,7 +85,7 @@ void StarTrekEngine::loadRoom(const Common::String &missionName, int roomIndex)
_gfx->fadeoutScreen();
_sound->stopAllVocSounds();
_gfx->setBackgroundImage(_gfx->loadBitmap(getScreenName()));
_gfx->setBackgroundImage(getScreenName());
_gfx->loadPri(getScreenName());
_gfx->loadPalette("palette");
_gfx->copyBackgroundScreen();

4
engines/startrek/graphics.cpp
View File

@ -72,8 +72,8 @@ Graphics::~Graphics() {
delete _font;
}
void Graphics::setBackgroundImage(Bitmap *bitmap) {
_backgroundImage = SharedPtr<Bitmap>(bitmap);
void Graphics::setBackgroundImage(Common::String imageName) {
_backgroundImage = SharedPtr<Bitmap>(loadBitmap(imageName));
}
void Graphics::drawBitmapToBackground(const Common::Rect &origRect, const Common::Rect &drawRect, Bitmap *bitmap) {

2
engines/startrek/graphics.h
View File

@ -51,7 +51,7 @@ public:
Graphics(StarTrekEngine *vm);
~Graphics();
void setBackgroundImage(Bitmap *bitmap);
void setBackgroundImage(Common::String imageName);
/**
* @param origRect The rectangle containing the original bitmap (must contain the
* whole bitmap, even if some is outside the drawable space)

2
engines/startrek/intro.cpp
View File

@ -45,7 +45,7 @@ void StarTrekEngine::playIntro() {
_gfx->clearScreenAndPriBuffer();
_gfx->fadeoutScreen();
_gfx->loadPalette("gold");
_gfx->setBackgroundImage(_gfx->loadBitmap("goldlogo"));
_gfx->setBackgroundImage("goldlogo");
_sound->playVoc("logo");
_gfx->copyBackgroundScreen();
_system->updateScreen();

6
engines/startrek/menu.cpp
View File

@ -1028,7 +1028,7 @@ void StarTrekEngine::showRepublicMap(int16 arg0, int16 turbolift) {
_gfx->pushSprites();
if (!_awayMission.veng.showedRepublicMapFirstTime) {
_gfx->setBackgroundImage(_gfx->loadBitmap("veng9b"));
_gfx->setBackgroundImage("veng9b");
_gfx->copyBackgroundScreen();
_system->updateScreen();
_system->delayMillis(10);
@ -1085,7 +1085,7 @@ void StarTrekEngine::showRepublicMap(int16 arg0, int16 turbolift) {
_gfx->fadeoutScreen();
}
_gfx->setBackgroundImage(_gfx->loadBitmap("veng9"));
_gfx->setBackgroundImage("veng9");
_gfx->copyBackgroundScreen();
_system->updateScreen();
_system->delayMillis(10);
@ -1171,7 +1171,7 @@ lclick:
_gfx->popSprites();
_gfx->loadPri(getScreenName());
_gfx->setBackgroundImage(_gfx->loadBitmap(getScreenName()));
_gfx->setBackgroundImage(getScreenName());
_gfx->copyBackgroundScreen();
_system->updateScreen();
_system->delayMillis(10);

4
engines/startrek/rooms/demon4.cpp
View File

@ -383,7 +383,7 @@ bool Room::demon4ShowSunPuzzle() {
_vm->_sound->stopAllVocSounds();
_vm->_gfx->pushSprites();
_vm->_gfx->setBackgroundImage(_vm->_gfx->loadBitmap("machineb"));
_vm->_gfx->setBackgroundImage("machineb");
_vm->_gfx->copyBackgroundScreen();
_vm->_gfx->clearPri();
@ -528,7 +528,7 @@ done:
_vm->_gfx->fadeoutScreen();
_vm->_gfx->popSprites();
_vm->_gfx->loadPri(_vm->getScreenName());
_vm->_gfx->setBackgroundImage(_vm->_gfx->loadBitmap(_vm->getScreenName()));
_vm->_gfx->setBackgroundImage(_vm->getScreenName());
_vm->_gfx->copyBackgroundScreen();
_vm->_gfx->forceDrawAllSprites();

4
engines/startrek/rooms/demon6.cpp
View File

@ -452,7 +452,7 @@ int Room::demon6ShowCase(int visible) {
_vm->_gfx->fadeoutScreen();
_vm->_gfx->pushSprites();
_vm->_gfx->setBackgroundImage(_vm->_gfx->loadBitmap("stlcase"));
_vm->_gfx->setBackgroundImage("stlcase");
_vm->_gfx->copyBackgroundScreen();
_vm->_gfx->clearPri();
@ -489,7 +489,7 @@ int Room::demon6ShowCase(int visible) {
_vm->_gfx->fadeoutScreen();
_vm->_gfx->popSprites();
_vm->_gfx->loadPri(_vm->getScreenName());
_vm->_gfx->setBackgroundImage(_vm->_gfx->loadBitmap(_vm->getScreenName()));
_vm->_gfx->setBackgroundImage(_vm->getScreenName());
_vm->_gfx->copyBackgroundScreen();
_vm->_gfx->forceDrawAllSprites();

3
engines/startrek/startrek.cpp
View File

@ -274,8 +274,7 @@ void StarTrekEngine::runTransportSequence(const Common::String &name) {
actorFunc1();
initActors();
Bitmap *bgImage = _gfx->loadBitmap("transprt");
_gfx->setBackgroundImage(bgImage);
_gfx->setBackgroundImage("transprt");
_gfx->clearPri();
_gfx->loadPalette("palette");
_gfx->copyBackgroundScreen();