diff options
Diffstat (limited to 'engines/lab')
-rw-r--r-- | engines/lab/graphics.cpp | 6 | ||||
-rw-r--r-- | engines/lab/mouse.cpp | 2 | ||||
-rw-r--r-- | engines/lab/text.cpp | 3 | ||||
-rw-r--r-- | engines/lab/vga.cpp | 13 | ||||
-rw-r--r-- | engines/lab/vga.h | 3 |
5 files changed, 1 insertions, 26 deletions
diff --git a/engines/lab/graphics.cpp b/engines/lab/graphics.cpp index bc10e8fcb9..7bd2af41d7 100644 --- a/engines/lab/graphics.cpp +++ b/engines/lab/graphics.cpp @@ -423,7 +423,7 @@ void drawMessage(const char *str) { static void doScrollBlack() { byte *mem, *tempmem; Image Im; - uint16 width, height, by, nheight, CurPage; + uint16 width, height, by, nheight; uint32 size, copysize; uint32 *BaseAddr; @@ -459,7 +459,6 @@ static void doScrollBlack() { mem += by * width; nheight -= by; size = (int32) nheight * (int32) width; - CurPage = 0; tempmem = mem; while (size) { @@ -470,10 +469,8 @@ static void doScrollBlack() { size -= copysize; - setPage(CurPage); memcpy(BaseAddr, tempmem, copysize); tempmem += copysize; - CurPage++; } setAPen(0); @@ -524,7 +521,6 @@ static void copyPage(uint16 width, uint16 height, uint16 nheight, uint16 startli size -= copysize; - setPage(CurPage); memcpy(BaseAddr + (OffSet >> 2), mem, copysize); mem += copysize; CurPage++; diff --git a/engines/lab/mouse.cpp b/engines/lab/mouse.cpp index 8636ad7733..553b6654a2 100644 --- a/engines/lab/mouse.cpp +++ b/engines/lab/mouse.cpp @@ -81,7 +81,6 @@ static Gadget *checkGadgetHit(Gadget *gadlist, uint16 x, uint16 y) { if (IsHiRes) { hitgad = gadlist; } else { - VGAStorePage(); mouseHide(); drawImage(gadlist->ImAlt, gadlist->x, gadlist->y); mouseShow(); @@ -92,7 +91,6 @@ static Gadget *checkGadgetHit(Gadget *gadlist, uint16 x, uint16 y) { mouseHide(); drawImage(gadlist->Im, gadlist->x, gadlist->y); mouseShow(); - VGARestorePage(); } return gadlist; diff --git a/engines/lab/text.cpp b/engines/lab/text.cpp index 807df45a04..c89cec389a 100644 --- a/engines/lab/text.cpp +++ b/engines/lab/text.cpp @@ -90,7 +90,6 @@ void text(struct TextFont *tf, uint16 x, uint16 y, uint16 color, const char *tex SegmentOffset = RealOffset - (curpage * VGABytesPerPage); LeftInSegment = VGABytesPerPage - SegmentOffset; VGACur = VGATop + SegmentOffset; - setPage(curpage); if (tf->Widths[(uint)*text]) { cdata = tf->data + tf->Offsets[(uint)*text]; @@ -120,7 +119,6 @@ void text(struct TextFont *tf, uint16 x, uint16 y, uint16 color, const char *tex for (counterb = 0; counterb < 8; counterb++) { if (templeft <= 0) { curpage++; - setPage(curpage); VGATemp = (byte *)(VGATop - templeft); /* Set up VGATempLine for next line */ VGATempLine -= VGABytesPerPage; @@ -148,7 +146,6 @@ void text(struct TextFont *tf, uint16 x, uint16 y, uint16 color, const char *tex if (LeftInSegment <= 0) { curpage++; - setPage(curpage); VGATempLine -= VGABytesPerPage; LeftInSegment += VGABytesPerPage; } diff --git a/engines/lab/vga.cpp b/engines/lab/vga.cpp index aa31d19771..013b6ee9a6 100644 --- a/engines/lab/vga.cpp +++ b/engines/lab/vga.cpp @@ -88,19 +88,6 @@ bool createScreen(bool HiRes) { /*****************************************************************************/ /* Sets the current page on the VGA card. */ /*****************************************************************************/ -void setPage(uint16 PageNum) { - // PageNum should always calculated out to zero for SDL. - assert(PageNum == 0); -} - -void VGAStorePage() { - // does nothing in SDL -} - -void VGARestorePage() { - // does nothing in SDL -} - void changeVolume(int delta) { warning("STUB: changeVolume()"); } diff --git a/engines/lab/vga.h b/engines/lab/vga.h index 376411aede..aa5a26cda2 100644 --- a/engines/lab/vga.h +++ b/engines/lab/vga.h @@ -41,9 +41,6 @@ struct Image { byte *ImageData; }; -void setPage(uint16 PageNum); -void VGAStorePage(); -void VGARestorePage(); bool createScreen(bool HiRes); void waitTOF(); void quickWaitTOF(); |