diff options
| -rw-r--r-- | engines/lab/savegame.cpp | 3 | ||||
| -rw-r--r-- | engines/lab/text.cpp | 12 | ||||
| -rw-r--r-- | engines/lab/vga.cpp | 13 |
3 files changed, 8 insertions, 20 deletions
diff --git a/engines/lab/savegame.cpp b/engines/lab/savegame.cpp index 4d40540ce4..a32971ba5f 100644 --- a/engines/lab/savegame.cpp +++ b/engines/lab/savegame.cpp @@ -58,6 +58,7 @@ extern CrumbData BreadCrumbs[MAX_CRUMBS]; extern uint16 NumCrumbs; extern bool DroppingCrumbs; extern bool FollowingCrumbs; +extern char *getPictName(CloseDataPtr *LCPtr); void writeSaveGameHeader(Common::OutSaveFile *out, const Common::String &saveName) { out->writeUint32BE(SAVEGAME_ID); @@ -128,8 +129,6 @@ bool readSaveGameHeader(Common::InSaveFile *in, SaveGameHeader &header) { return true; } -extern char *getPictName(CloseDataPtr *LCPtr); - /*****************************************************************************/ /* Writes the game out to disk. */ /*****************************************************************************/ diff --git a/engines/lab/text.cpp b/engines/lab/text.cpp index 5120a19a5c..e99114ecda 100644 --- a/engines/lab/text.cpp +++ b/engines/lab/text.cpp @@ -35,6 +35,8 @@ namespace Lab { +extern uint32 VGAScreenWidth, VGABytesPerPage; + /*****************************************************************************/ /* Opens up a font from disk. */ /*****************************************************************************/ @@ -59,7 +61,7 @@ bool openFont(const char *TextFontPath, struct TextFont **tf) { readBlock((*tf)->Offsets, 256L * 2L, file); swapUShortPtr((*tf)->Offsets, 256); - skip(file, 4L); + (*file) += 4; if (((*tf)->data = (byte *)calloc((*tf)->DataLength, 1))) { readBlock((*tf)->data, (*tf)->DataLength, file); @@ -75,7 +77,6 @@ bool openFont(const char *TextFontPath, struct TextFont **tf) { return false; } - /*****************************************************************************/ /* Closes a font and frees all memory associated with it. */ /*****************************************************************************/ @@ -88,8 +89,6 @@ void closeFont(struct TextFont *tf) { } } - - /*****************************************************************************/ /* Returns the length of a text in the specified font. */ /*****************************************************************************/ @@ -114,11 +113,6 @@ uint16 textHeight(struct TextFont *tf) { return (tf) ? tf->Height : 0; } - - -extern uint32 VGAScreenWidth, VGABytesPerPage; - - /*****************************************************************************/ /* Draws the text to the screen. */ /*****************************************************************************/ diff --git a/engines/lab/vga.cpp b/engines/lab/vga.cpp index 31477a78e9..7b745760c4 100644 --- a/engines/lab/vga.cpp +++ b/engines/lab/vga.cpp @@ -38,6 +38,9 @@ namespace Lab { +static byte curvgapal[256 * 3]; +static unsigned char curapen = 0; + uint32 VGAScreenWidth = 320UL, VGAScreenHeight = 200UL, VGABytesPerPage = 65536UL; @@ -58,6 +61,7 @@ uint16 g_NextKeyIn = 0; uint16 g_KeyBuf[64]; uint16 g_NextKeyOut = 0; bool g_MouseAtEdge = false; +byte *TempScrollData; /*****************************************************************************/ /* Sets up either a low-res or a high-res 256 color screen. */ @@ -245,8 +249,6 @@ void WSDL_SetColors(byte *buf, uint16 first, uint16 numreg, uint16 slow) { waitTOF(); } -static byte curvgapal[256 * 3]; - /*****************************************************************************/ /* Writes any number of the 256 color registers. */ /* first: the number of the first color register to write. */ @@ -467,9 +469,6 @@ void readScreenImage(Image *Im, uint16 x, uint16 y) { } } - - - /*****************************************************************************/ /* Blits a piece of one image to another. */ /* NOTE: for our purposes, assumes that ImDest is to be in VGA memory. */ @@ -515,8 +514,6 @@ void bltBitMap(Image *ImSource, uint16 xs, uint16 ys, Image *ImDest, } } -byte *TempScrollData; - /*****************************************************************************/ /* Scrolls the display in the x direction by blitting. */ /* The TempScrollData variable must be initialized to some memory, or this */ @@ -603,8 +600,6 @@ void scrollDisplayY(int16 dy, uint16 x1, uint16 y1, uint16 x2, uint16 y2) { } } -static unsigned char curapen = 0; - /*****************************************************************************/ /* Sets the pen number to use on all the drawing operations. */ /*****************************************************************************/ |