From 6ab5edf7629ae2166b0fdc9773005d240ade5d3e Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Mon, 22 Dec 2014 10:36:39 +0100 Subject: LAB: Further cleanup --- engines/lab/labfile.cpp | 78 ------------------------------------------------- engines/lab/labfun.h | 12 -------- 2 files changed, 90 deletions(-) diff --git a/engines/lab/labfile.cpp b/engines/lab/labfile.cpp index e4045b5801..7c7875afe0 100644 --- a/engines/lab/labfile.cpp +++ b/engines/lab/labfile.cpp @@ -401,82 +401,4 @@ void freeAllStolenMem(void) { MemPlace = buffer; } - - - -/*--------------- Routines that read partial chunks of a file ---------------*/ - - - -/*****************************************************************************/ -/* Reads Size amount of bytes into buffer. */ -/*****************************************************************************/ -uint32 readPartial(int32 File, void *buf, uint32 Size) { - uint32 haveread = 0; - - warning("STUB: readPartial"); - -#if 0 - uint32 nsize; - - while (Size) { - if (Size > MAXREADSIZE) - nsize = MAXREADSIZE; - else - nsize = Size; - - haveread += (uint32)(read((int) File, buf, (int) nsize)); - Size -= nsize; - ((char *) buf) += nsize; - updateMouse(); - } -#endif - return haveread; -} - - - -/*****************************************************************************/ -/* Reads Size amount of bytes into buffer. Use this one if the data must */ -/* absolutely be correct (compressed data for example). Otherwise, because */ -/* of the DMA bug, last two bytes may be screwed. */ -/*****************************************************************************/ -uint32 newReadPartial(int32 File, void *buf, uint32 Size) { - return readPartial((int) File, buf, Size); -} - - - -/*****************************************************************************/ -/* Reads Size amount of bytes into buffer. Use this one if the data must */ -/* absolutely be correct (compressed data for example). Otherwise, because */ -/* of the DMA bug, last two bytes may be screwed. This one will work if the */ -/* data is not padded the extra two bytes. */ -/*****************************************************************************/ -uint32 bufferedReadPartial(int32 File, void *buf, uint32 Size) { - return readPartial(File, buf, Size); -} - - - -/*****************************************************************************/ -/* Sets the current position in the file relative to the beginning of the */ -/* file. */ -/*****************************************************************************/ -void setPos(int32 File, uint32 Place) { - warning("STUB: setPos"); - //lseek((int) File, (int32) Place, SEEK_SET); -} - - - -/*****************************************************************************/ -/* Skips a certain number of bytes either forward or backwards. */ -/*****************************************************************************/ -void skipPartial(int32 File, int32 Skip) { - warning("STUB: skipPartial"); - - //lseek((int) File, Skip, SEEK_CUR); -} - } // End of namespace Lab diff --git a/engines/lab/labfun.h b/engines/lab/labfun.h index 08130f3e0b..995177b654 100644 --- a/engines/lab/labfun.h +++ b/engines/lab/labfun.h @@ -203,18 +203,6 @@ Common::File *openPartial(const char *name); void closePartial(int32 File); -uint32 readPartial(int32 File, void *buffer, uint32 Size); - -uint32 newReadPartial(int32 File, void *buffer, uint32 Size); - -uint32 bufferedReadPartial(int32 File, void *buffer, uint32 Size); - - -void setPos(int32 File, uint32 Place); - -void skipPartial(int32 File, int32 Skip); - - /*---------------------------*/ /*------ From LabText.c -----*/ -- cgit v1.2.3