libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-21 01:05:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

LAB: Remove unused return values

Browse Source
This commit is contained in:
Filippos Karapetis 2015-12-08 17:19:08 +02:00 committed by Willem Jan Palenstijn
parent ff6dfee221
commit c9ca5a0dd0
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/lab/engine.cpp
View File

@ -1063,11 +1063,7 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm
void LabEngine::go() {
_isHiRes = ((getFeatures() & GF_LOWRES) == 0);
if (!_graphics->setUpScreens()) {
_isHiRes = false;
_graphics->setUpScreens();
}
_graphics->setUpScreens();
_event->initMouse();
_msgFont = _resource->getFont("P:AvanteG.12");

11
engines/lab/graphics.cpp
View File

@ -426,9 +426,8 @@ void DisplayMan::drawPanel() {
/**
* Sets up the Labyrinth screens, and opens up the initial windows.
*/
bool DisplayMan::setUpScreens() {
if (!createScreen(_vm->_isHiRes))
return false;
void DisplayMan::setUpScreens() {
createScreen(_vm->_isHiRes);
Common::File *controlFile = _vm->_resource->openDataFile("P:Control");
for (uint16 i = 0; i < 20; i++)
@ -475,8 +474,6 @@ bool DisplayMan::setUpScreens() {
}
delete invFile;
return true;
}
/**
@ -543,7 +540,7 @@ void DisplayMan::screenUpdate() {
/**
* Sets up either a low-res or a high-res 256 color screen.
*/
bool DisplayMan::createScreen(bool hiRes) {
void DisplayMan::createScreen(bool hiRes) {
if (hiRes) {
_screenWidth = 640;
_screenHeight = 480;
@ -553,8 +550,6 @@ bool DisplayMan::createScreen(bool hiRes) {
}
_screenBytesPerPage = _screenWidth * _screenHeight;
_displayBuffer = new byte[_screenBytesPerPage]; // FIXME: Memory leak!
return true;
}
/**

4
engines/lab/graphics.h
View File

@ -89,7 +89,7 @@ public:
void blackAllScreen();
void createBox(uint16 y2);
void drawPanel();
bool setUpScreens();
void setUpScreens();
int32 longDrawMessage(const char *str);
void drawMessage(const char *str);
void setAPen(byte pennum);
@ -137,7 +137,7 @@ public:
void drawHLine(uint16 x, uint16 y1, uint16 y2);
void drawVLine(uint16 x1, uint16 y, uint16 x2);
void screenUpdate();
bool createScreen(bool HiRes);
void createScreen(bool HiRes);
void setAmigaPal(uint16 *pal, uint16 numColors);
void writeColorRegs(byte *buf, uint16 first, uint16 numreg);
void setPalette(void *cmap, uint16 numcolors);