thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LAB: Set a default to the second parameter of readPict

Browse source
This commit is contained in:
Strangerke 2015-12-20 16:52:49 +01:00 • committed by Willem Jan Palenstijn
parent 4dfc428bac
commit cff1f99b26
8 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/lab/dispman.cpp
View file

@ -78,7 +78,7 @@ void DisplayMan::loadPict(const Common::String filename) {
void DisplayMan::loadBackPict(const Common::String fileName, uint16 *highPal) { void DisplayMan::loadBackPict(const Common::String fileName, uint16 *highPal) {
_fadePalette = highPal; _fadePalette = highPal;
_vm->_anim->_noPalChange = true; _vm->_anim->_noPalChange = true;
readPict(fileName, true); readPict(fileName);
for (uint16 i = 0; i < 16; i++) { for (uint16 i = 0; i < 16; i++) {
highPal[i] = ((_vm->_anim->_diffPalette[i * 3] >> 2) << 8) + highPal[i] = ((_vm->_anim->_diffPalette[i * 3] >> 2) << 8) +

2
engines/lab/dispman.h
View file

@ -85,7 +85,7 @@ public:
/** /**
* Reads in a picture into the display bitmap. * Reads in a picture into the display bitmap.
*/ */
void readPict(Common::String filename, bool playOnce, bool onlyDiffData = false, byte *memoryBuffer = nullptr, uint16 maxHeight = 0); void readPict(Common::String filename, bool playOnce = true, bool onlyDiffData = false, byte *memoryBuffer = nullptr, uint16 maxHeight = 0);
void freePict(); void freePict();
/** /**

14
engines/lab/engine.cpp
View file

@ -331,7 +331,7 @@ bool LabEngine::doUse(uint16 curInv) {
_anim->_doBlack = false; _anim->_doBlack = false;
_anim->_waitForEffect = true; _anim->_waitForEffect = true;
_graphics->readPict("Music:Click", true); _graphics->readPict("Music:Click");
_anim->_waitForEffect = false; _anim->_waitForEffect = false;
_anim->_doBlack = false; _anim->_doBlack = false;
@ -461,7 +461,7 @@ void LabEngine::mainGameLoop() {
switch (_closeDataPtr->_closeUpType) { switch (_closeDataPtr->_closeUpType) {
case SPECIALLOCK: case SPECIALLOCK:
if (_mainDisplay) if (_mainDisplay)
_tilePuzzle->showCombination(_curFileName.c_str()); _tilePuzzle->showCombination(_curFileName);
break; break;
case SPECIALBRICK: case SPECIALBRICK:
case SPECIALBRICKNOMOUSE: case SPECIALBRICKNOMOUSE:
@ -469,11 +469,11 @@ void LabEngine::mainGameLoop() {
_tilePuzzle->showTile(_curFileName, (_closeDataPtr->_closeUpType == SPECIALBRICKNOMOUSE)); _tilePuzzle->showTile(_curFileName, (_closeDataPtr->_closeUpType == SPECIALBRICKNOMOUSE));
break; break;
default: default:
_graphics->readPict(_curFileName.c_str(), false); _graphics->readPict(_curFileName, false);
break; break;
} }
} else } else
_graphics->readPict(_curFileName.c_str(), false); _graphics->readPict(_curFileName, false);
drawRoomMessage(curInv, _closeDataPtr); drawRoomMessage(curInv, _closeDataPtr);
forceDraw = false; forceDraw = false;
@ -553,15 +553,15 @@ void LabEngine::mainGameLoop() {
void LabEngine::showLab2Teaser() { void LabEngine::showLab2Teaser() {
_graphics->blackAllScreen(); _graphics->blackAllScreen();
_graphics->readPict("P:End/L2In.1", true); _graphics->readPict("P:End/L2In.1");
for (uint16 i = 0; i < 120; i++) { for (uint16 i = 0; i < 120; i++) {
_music->updateMusic(); _music->updateMusic();
waitTOF(); waitTOF();
} }
_graphics->readPict("P:End/L2In.9", true); _graphics->readPict("P:End/L2In.9");
_graphics->readPict("P:End/Lost", true); _graphics->readPict("P:End/Lost");
while (!_event->getMsg() && !shouldQuit()) { while (!_event->getMsg() && !shouldQuit()) {
_music->updateMusic(); _music->updateMusic();

4
engines/lab/processroom.cpp
View file

@ -291,7 +291,7 @@ void LabEngine::doActions(Action *actionList, CloseDataPtr *closePtrList) {
if (test != _curFileName) { if (test != _curFileName) {
_curFileName = test; _curFileName = test;
_graphics->readPict(_curFileName, true); _graphics->readPict(_curFileName);
} }
} }
break; break;
@ -339,7 +339,7 @@ void LabEngine::doActions(Action *actionList, CloseDataPtr *closePtrList) {
if (actionList->_param1 & 0x8000) { if (actionList->_param1 & 0x8000) {
// This is a Wyrmkeep Windows trial version, thus stop at this // This is a Wyrmkeep Windows trial version, thus stop at this
// point, since we can't check for game payment status // point, since we can't check for game payment status
_graphics->readPict(getPictName(closePtrList), true); _graphics->readPict(getPictName(closePtrList));
actionList = nullptr; actionList = nullptr;
GUI::MessageDialog trialMessage("This is the end of the trial version. You can play the full game using the original interpreter from Wyrmkeep"); GUI::MessageDialog trialMessage("This is the end of the trial version. You can play the full game using the original interpreter from Wyrmkeep");
trialMessage.runModal(); trialMessage.runModal();

2
engines/lab/savegame.cpp
View file

@ -132,7 +132,7 @@ bool LabEngine::saveGame(int slot, Common::String desc) {
// Load scene pic // Load scene pic
CloseDataPtr closePtr = nullptr; CloseDataPtr closePtr = nullptr;
_graphics->readPict(getPictName(&closePtr), true); _graphics->readPict(getPictName(&closePtr));
writeSaveGameHeader(file, desc); writeSaveGameHeader(file, desc);
file->writeUint16LE(_roomNum); file->writeUint16LE(_roomNum);

8
engines/lab/special.cpp
View file

@ -448,10 +448,10 @@ void LabEngine::doMonitor(Common::String background, Common::String textfile, bo
_monitorTextFilename = textfile; _monitorTextFilename = textfile;
_graphics->blackAllScreen(); _graphics->blackAllScreen();
_graphics->readPict("P:Mon/Monitor.1", true); _graphics->readPict("P:Mon/Monitor.1");
_graphics->readPict("P:Mon/NWD1", true); _graphics->readPict("P:Mon/NWD1");
_graphics->readPict("P:Mon/NWD2", true); _graphics->readPict("P:Mon/NWD2");
_graphics->readPict("P:Mon/NWD3", true); _graphics->readPict("P:Mon/NWD3");
_graphics->blackAllScreen(); _graphics->blackAllScreen();
_monitorPage = 0; _monitorPage = 0;

8
engines/lab/tilepuzzle.cpp
View file

@ -175,7 +175,7 @@ void TilePuzzle::changeTile(uint16 col, uint16 row) {
// unlocked combination // unlocked combination
_vm->_conditions->inclElement(BRICKOPEN); _vm->_conditions->inclElement(BRICKOPEN);
_vm->_anim->_doBlack = true; _vm->_anim->_doBlack = true;
_vm->_graphics->readPict("p:Up/BDOpen", true); _vm->_graphics->readPict("p:Up/BDOpen");
} }
} }
} }
@ -254,7 +254,7 @@ void TilePuzzle::doTile(bool showsolution) {
void TilePuzzle::showTile(const Common::String filename, bool showSolution) { void TilePuzzle::showTile(const Common::String filename, bool showSolution) {
_vm->_anim->_doBlack = true; _vm->_anim->_doBlack = true;
_vm->_anim->_noPalChange = true; _vm->_anim->_noPalChange = true;
_vm->_graphics->readPict(filename, true); _vm->_graphics->readPict(filename);
_vm->_anim->_noPalChange = false; _vm->_anim->_noPalChange = false;
_vm->_graphics->blackScreen(); _vm->_graphics->blackScreen();
@ -379,10 +379,10 @@ void TilePuzzle::doCombination() {
/** /**
* Reads in a backdrop picture. * Reads in a backdrop picture.
*/ */
void TilePuzzle::showCombination(const char *filename) { void TilePuzzle::showCombination(const Common::String filename) {
_vm->_anim->_doBlack = true; _vm->_anim->_doBlack = true;
_vm->_anim->_noPalChange = true; _vm->_anim->_noPalChange = true;
_vm->_graphics->readPict(filename, true); _vm->_graphics->readPict(filename);
_vm->_anim->_noPalChange = false; _vm->_anim->_noPalChange = false;
_vm->_graphics->blackScreen(); _vm->_graphics->blackScreen();

2
engines/lab/tilepuzzle.h
View file

@ -52,7 +52,7 @@ public:
void mouseTile(Common::Point pos); void mouseTile(Common::Point pos);
void showTile(const Common::String filename, bool showSolution); void showTile(const Common::String filename, bool showSolution);
void mouseCombination(Common::Point pos); void mouseCombination(Common::Point pos);
void showCombination(const char *filename); void showCombination(const Common::String filename);
void save(Common::OutSaveFile *file); void save(Common::OutSaveFile *file);
void load(Common::InSaveFile *file); void load(Common::InSaveFile *file);