diff options
author | Filippos Karapetis | 2015-10-08 04:36:15 +0300 |
---|---|---|
committer | Eugene Sandulenko | 2015-12-15 00:05:02 +0100 |
commit | 76b66de8b673b878efe4ef5159a0dec20bd94890 (patch) | |
tree | e4847ad5723daee300e4e28b1d38d9e89a1890c4 /engines/lab | |
parent | d0171440df2d7b372563f342eac6cdd11488311f (diff) | |
download | scummvm-rg350-76b66de8b673b878efe4ef5159a0dec20bd94890.tar.gz scummvm-rg350-76b66de8b673b878efe4ef5159a0dec20bd94890.tar.bz2 scummvm-rg350-76b66de8b673b878efe4ef5159a0dec20bd94890.zip |
LAB: Remove dead code
Diffstat (limited to 'engines/lab')
-rw-r--r-- | engines/lab/graphics.cpp | 7 | ||||
-rw-r--r-- | engines/lab/readdiff.cpp | 7 | ||||
-rw-r--r-- | engines/lab/special.cpp | 6 | ||||
-rw-r--r-- | engines/lab/text.cpp | 2 | ||||
-rw-r--r-- | engines/lab/vga.cpp | 20 | ||||
-rw-r--r-- | engines/lab/vga.h | 1 |
6 files changed, 0 insertions, 43 deletions
diff --git a/engines/lab/graphics.cpp b/engines/lab/graphics.cpp index 049053f470..23e587c047 100644 --- a/engines/lab/graphics.cpp +++ b/engines/lab/graphics.cpp @@ -86,8 +86,6 @@ bool readPict(const char *filename, bool PlayOnce) { readDiff(PlayOnce); - ungetVGABaseAddr(); - return true; } @@ -488,7 +486,6 @@ static void doScrollBlack() { freeAllStolenMem(); mouseShow(); - ungetVGABaseAddr(); } @@ -526,8 +523,6 @@ static void copyPage(uint16 width, uint16 height, uint16 nheight, uint16 startli CurPage++; OffSet = 0; } - - ungetVGABaseAddr(); } @@ -751,8 +746,6 @@ static void doTransWipe(CloseDataPtr *CPtr, char *filename) { } } } - - ungetVGABaseAddr(); } diff --git a/engines/lab/readdiff.cpp b/engines/lab/readdiff.cpp index 6820e4ea8a..ab93d32c1d 100644 --- a/engines/lab/readdiff.cpp +++ b/engines/lab/readdiff.cpp @@ -277,9 +277,6 @@ void diffNextFrame() { IsPlaying = false; mouseShow(); - if (DispBitMap->Flags & BITMAPF_VIDEO) - ungetVGABaseAddr(); - if (!didTOF) WSDL_UpdateScreen(); @@ -295,10 +292,6 @@ void diffNextFrame() { break; } } - - if (DispBitMap->Flags & BITMAPF_VIDEO) - ungetVGABaseAddr(); - } diff --git a/engines/lab/special.cpp b/engines/lab/special.cpp index 4d64dd3914..bedf7215d0 100644 --- a/engines/lab/special.cpp +++ b/engines/lab/special.cpp @@ -214,8 +214,6 @@ static void changeCombination(uint16 number) { g_lab->_conditions->inclElement(COMBINATIONUNLOCKED); else g_lab->_conditions->exclElement(COMBINATIONUNLOCKED); - - ungetVGABaseAddr(); } @@ -735,8 +733,6 @@ static void drawJournal(uint16 wipenum, bool needFade) { else unGhoastGadget(&ForwardG); - ungetVGABaseAddr(); - if (needFade) fade(true, 0); @@ -832,8 +828,6 @@ void doJournal() { blackScreen(); freeAllStolenMem(); - - ungetVGABaseAddr(); } bool saveRestoreGame() { diff --git a/engines/lab/text.cpp b/engines/lab/text.cpp index e99114ecda..f31515fa5f 100644 --- a/engines/lab/text.cpp +++ b/engines/lab/text.cpp @@ -198,8 +198,6 @@ void text(struct TextFont *tf, uint16 x, uint16 y, uint16 color, const char *tex x += tf->Widths[(int)*text]; text++; } - - ungetVGABaseAddr(); } } // End of namespace Lab diff --git a/engines/lab/vga.cpp b/engines/lab/vga.cpp index 7b745760c4..aa31d19771 100644 --- a/engines/lab/vga.cpp +++ b/engines/lab/vga.cpp @@ -290,16 +290,11 @@ byte *WSDL_LockVideo() { return g_DisplayBuffer; } -void WSDL_UnlockVideo() { -} - void WSDL_IgnoreUpdateDisplay(int state) { g_IgnoreUpdateDisplay = state; } void WSDL_UpdateScreen() { - WSDL_UnlockVideo(); - if (g_ScreenWasLocked && !g_IgnoreUpdateDisplay) { g_system->copyRectToScreen(g_DisplayBuffer, VGAScreenWidth, 0, 0, VGAScreenWidth, VGAScreenHeight); g_system->updateScreen(); @@ -319,11 +314,6 @@ byte *getVGABaseAddr() { return WSDL_LockVideo(); } -void ungetVGABaseAddr() { - if (!VGABASEADDRESS) - WSDL_UnlockVideo(); -} - /*****************************************************************************/ /* Draws an image to the screen. */ /*****************************************************************************/ @@ -364,8 +354,6 @@ void drawImage(Image *Im, uint16 x, uint16 y) { s += Im->Width; d += VGAScreenWidth; } - - ungetVGABaseAddr(); } } @@ -419,8 +407,6 @@ void drawMaskImage(Image *Im, uint16 x, uint16 y) { s += Im->Width; d += VGAScreenWidth; } - - ungetVGABaseAddr(); } } @@ -464,8 +450,6 @@ void readScreenImage(Image *Im, uint16 x, uint16 y) { s += Im->Width; d += VGAScreenWidth; } - - ungetVGABaseAddr(); } } @@ -647,8 +631,6 @@ void rectFill(uint16 x1, uint16 y1, uint16 x2, uint16 y2) { d += VGAScreenWidth; } - - ungetVGABaseAddr(); } } @@ -714,8 +696,6 @@ void ghoastRect(uint16 pencolor, uint16 x1, uint16 y1, uint16 x2, uint16 y2) { d += VGAScreenWidth; dy++; } - - ungetVGABaseAddr(); } } diff --git a/engines/lab/vga.h b/engines/lab/vga.h index 5821a0cd82..376411aede 100644 --- a/engines/lab/vga.h +++ b/engines/lab/vga.h @@ -48,7 +48,6 @@ bool createScreen(bool HiRes); void waitTOF(); void quickWaitTOF(); byte *getVGABaseAddr(); -void ungetVGABaseAddr(); void writeColorReg(byte *buf, uint16 regnum); void writeColorRegs(byte *buf, uint16 first, uint16 numreg); void writeColorRegsSmooth(byte *buf, uint16 first, uint16 numreg); |