aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2015-12-08 17:19:08 +0200
committerWillem Jan Palenstijn2015-12-23 21:33:56 +0100
commitc9ca5a0dd02bd83c1ed78a3f387206f69c8ebbab (patch)
tree681a0111e83e3e199b35127d633287a620d2c9e2
parentff6dfee221ac017caeb3c10389766129b0339e5e (diff)
downloadscummvm-rg350-c9ca5a0dd02bd83c1ed78a3f387206f69c8ebbab.tar.gz
scummvm-rg350-c9ca5a0dd02bd83c1ed78a3f387206f69c8ebbab.tar.bz2
scummvm-rg350-c9ca5a0dd02bd83c1ed78a3f387206f69c8ebbab.zip
LAB: Remove unused return values
-rw-r--r--engines/lab/engine.cpp6
-rw-r--r--engines/lab/graphics.cpp11
-rw-r--r--engines/lab/graphics.h4
3 files changed, 6 insertions, 15 deletions
diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp
index 5ea7df8c67..fe334f4e7e 100644
--- a/engines/lab/engine.cpp
+++ b/engines/lab/engine.cpp
@@ -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");
diff --git a/engines/lab/graphics.cpp b/engines/lab/graphics.cpp
index 3d0bbe16db..efd24b294d 100644
--- a/engines/lab/graphics.cpp
+++ b/engines/lab/graphics.cpp
@@ -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;
}
/**
diff --git a/engines/lab/graphics.h b/engines/lab/graphics.h
index 71c824618b..c2c3e824fd 100644
--- a/engines/lab/graphics.h
+++ b/engines/lab/graphics.h
@@ -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);