diff options
author | Strangerke | 2016-12-27 10:43:15 -0800 |
---|---|---|
committer | Eugene Sandulenko | 2017-01-25 22:42:18 +0100 |
commit | 7b95465309a0f23846b0780f89855c2626dbc486 (patch) | |
tree | 8da229b6f91404f91ec0bd44dd4b8236e09c0192 /engines/cryo | |
parent | 2d3bbebc6bba4785018e0aaaf3fb5f46ffbb486e (diff) | |
download | scummvm-rg350-7b95465309a0f23846b0780f89855c2626dbc486.tar.gz scummvm-rg350-7b95465309a0f23846b0780f89855c2626dbc486.tar.bz2 scummvm-rg350-7b95465309a0f23846b0780f89855c2626dbc486.zip |
CRYO: change the definition of verifh and expand_hsq
Diffstat (limited to 'engines/cryo')
-rw-r--r-- | engines/cryo/eden.cpp | 22 | ||||
-rw-r--r-- | engines/cryo/eden.h | 4 |
2 files changed, 13 insertions, 13 deletions
diff --git a/engines/cryo/eden.cpp b/engines/cryo/eden.cpp index bb6a3cddf8..8bf1f4213d 100644 --- a/engines/cryo/eden.cpp +++ b/engines/cryo/eden.cpp @@ -4666,9 +4666,9 @@ void EdenGame::effetpix() { } ////// datfile.c -void EdenGame::verifh(void *ptr) { +void EdenGame::verifh(byte *ptr) { byte sum = 0; - byte *head = (byte *)ptr; + byte *head = ptr; for (int8 i = 0; i < 6; i++) sum += *head++; @@ -4689,7 +4689,7 @@ void EdenGame::verifh(void *ptr) { for (; h3; h3--) *data-- = *head--; head = data + 1; - data = (byte *)ptr; + data = ptr; Expand_hsq(head, data); } @@ -4967,14 +4967,14 @@ void EdenGame::loadpartoffile(uint16 num, void *buffer, int32 pos, int32 len) { h_bigfile.read(buffer, len); } -void EdenGame::Expand_hsq(void *input, void *output) { - byte *src = (byte *)input; - byte *dst = (byte *)output; - byte *ptr; - uint16 bit; // bit - uint16 queue = 0; // queue - uint16 len = 0; - int16 ofs; +void EdenGame::Expand_hsq(byte *input, byte *output) { + byte *src = input; + byte *dst = output; + byte *ptr; + uint16 bit; // bit + uint16 queue = 0; // queue + uint16 len = 0; + int16 ofs; #define GetBit \ bit = queue & 1; \ queue >>= 1; \ diff --git a/engines/cryo/eden.h b/engines/cryo/eden.h index 9d27d162c5..a42c7f929d 100644 --- a/engines/cryo/eden.h +++ b/engines/cryo/eden.h @@ -276,7 +276,7 @@ private: void setDestRect(int16 sx, int16 sy, int16 ex, int16 ey); void wait(int howlong); void effetpix(); - void verifh(void *ptr); + void verifh(byte *ptr); void openbigfile(); void closebigfile(); void loadRawFile(uint16 num, byte *buffer); @@ -289,7 +289,7 @@ private: bool ReadDataSyncVOC(unsigned int num); bool ReadDataSync(uint16 num); void loadpartoffile(uint16 num, void *buffer, int32 pos, int32 len); - void Expand_hsq(void *input, void *output); + void Expand_hsq(byte *input, byte *output); void addInfo(byte info); void unlockInfo(); void nextInfo(); |