diff options
| author | Filippos Karapetis | 2015-10-08 04:37:58 +0300 |
|---|---|---|
| committer | Eugene Sandulenko | 2015-12-15 00:05:02 +0100 |
| commit | 454c02f321660585aa693329c7aa67eaf1f112fe (patch) | |
| tree | c57e0d81767d9ee60dbc38d4a6402422ec734a51 | |
| parent | 76b66de8b673b878efe4ef5159a0dec20bd94890 (diff) | |
| download | scummvm-rg350-454c02f321660585aa693329c7aa67eaf1f112fe.tar.gz scummvm-rg350-454c02f321660585aa693329c7aa67eaf1f112fe.tar.bz2 scummvm-rg350-454c02f321660585aa693329c7aa67eaf1f112fe.zip | |
LAB: Get rid of some uses of readBlock()
| -rw-r--r-- | engines/lab/labsets.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/lab/labsets.cpp b/engines/lab/labsets.cpp index d68370bf88..02107543c1 100644 --- a/engines/lab/labsets.cpp +++ b/engines/lab/labsets.cpp @@ -57,22 +57,22 @@ void LargeSet::exclElement(uint16 element) { } bool LargeSet::readInitialConditions(const char *fileName) { - byte **file; + byte *file; uint16 many, set; char temp[5]; if ((file = g_music->newOpen(fileName)) != NULL) { - readBlock(temp, 4L, file); + memcpy(&temp, file, 4); file += 4; temp[4] = '\0'; if (strcmp(temp, "CON0") != 0) return false; - readBlock(&many, 2L, file); + memcpy(&many, file, 2); file += 2; swapUShortPtr(&many, 1); for (int counter = 0; counter < many; counter++) { - readBlock(&set, 2L, file); + memcpy(&set, file, 2); file += 2; swapUShortPtr(&set, 1); inclElement(set); } |