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

LAB: Rewrite picture handling and get rid of the memory manager

Browse source
This commit is contained in:
Filippos Karapetis 2015-12-04 21:18:41 +02:00 • committed by Willem Jan Palenstijn
parent d376fd8dd0
commit a182a6af1a
13 changed files with 79 additions and 378 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/lab/lab.cpp
View file

@ -397,7 +397,6 @@ void LabEngine::doTile(bool showsolution) {
void LabEngine::showTile(const char *filename, bool showsolution) {
uint16 start = showsolution ? 0 : 1;
resetBuffer();
_anim->_doBlack = true;
_anim->_noPalChange = true;
_graphics->readPict(filename, true);
@ -411,8 +410,6 @@ void LabEngine::showTile(const char *filename, bool showsolution) {
delete tileFile;
allocFile((void **)&_tempScrollData, Tiles[1]->_width * Tiles[1]->_height * 2L, "tempdata");
doTile(showsolution);
setPalette(_anim->_diffPalette, 256);
}
@ -521,7 +518,6 @@ void LabEngine::doCombination() {
/* Reads in a backdrop picture. */
/*****************************************************************************/
void LabEngine::showCombination(const char *filename) {
resetBuffer();
_anim->_doBlack = true;
_anim->_noPalChange = true;
_graphics->readPict(filename, true);
@ -536,8 +532,6 @@ void LabEngine::showCombination(const char *filename) {
delete numFile;
allocFile((void **)&_tempScrollData, Images[0]->_width * Images[0]->_height * 2L, "tempdata");
doCombination();
setPalette(_anim->_diffPalette, 256);