diff options
author | Filippos Karapetis | 2015-12-05 18:14:50 +0200 |
---|---|---|
committer | Willem Jan Palenstijn | 2015-12-23 21:33:51 +0100 |
commit | ab1d9771d28cd70659505b900a07574e70113735 (patch) | |
tree | 9ed2a9e15b767c7912bcba8d4006f805ff0ceafe | |
parent | c42973604cbfa3a1c27c624a0b7caae8e70ec3c2 (diff) | |
download | scummvm-rg350-ab1d9771d28cd70659505b900a07574e70113735.tar.gz scummvm-rg350-ab1d9771d28cd70659505b900a07574e70113735.tar.bz2 scummvm-rg350-ab1d9771d28cd70659505b900a07574e70113735.zip |
LAB: Some cleanup of the monitor code
-rw-r--r-- | engines/lab/special.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/engines/lab/special.cpp b/engines/lab/special.cpp index 69a8aaedaf..6c96d18213 100644 --- a/engines/lab/special.cpp +++ b/engines/lab/special.cpp @@ -59,8 +59,7 @@ static bool GotBackImage = false; static uint16 monitorPage; static const char *TextFileName; -Image *MonButton, *AltMonButton, *MonQuit, *AltMonQuit, *MonBack, *AltMonBack, -*MonDown, *AltMonDown, *MonUp, *AltMonUp; +Image *MonButton; extern uint16 *FadePalette; extern BitMap *DispBitMap, *DrawBitMap; @@ -451,16 +450,6 @@ bool LabEngine::saveRestoreGame() { } /*****************************************************************************/ -/* Makes sure that the buttons are in memory. */ -/*****************************************************************************/ -static void getMonImages() { - Common::File *buttonFile = g_lab->_resource->openDataFile("P:MonImage"); - MonButton = new Image(buttonFile); - delete buttonFile; -} - - -/*****************************************************************************/ /* Draws the text for the monitor. */ /*****************************************************************************/ void LabEngine::drawMonText(char *text, TextFont *monitorFont, uint16 x1, uint16 y1, uint16 x2, uint16 y2, bool isinteractive) { @@ -639,7 +628,9 @@ void LabEngine::doMonitor(char *background, char *textfile, bool isinteractive, FadePalette = hipal; TextFont *monitorFont = _resource->getFont("P:Map.fon"); - getMonImages(); + Common::File *buttonFile = g_lab->_resource->openDataFile("P:MonImage"); + MonButton = new Image(buttonFile); + delete buttonFile; ntext = _resource->getText(textfile); loadBackPict(background, false); |