diff options
| author | Paweł Kołodziejski | 2003-03-05 22:21:24 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2003-03-05 22:21:24 +0000 |
| commit | 9921273f182c400e8f95186f0638b6c2233e37aa (patch) | |
| tree | e565239a9ec004d97a7fe6dfd5639ce8d731bb34 | |
| parent | c349bf123c918de42b39394eb0ab2f32bd74ae5a (diff) | |
| download | scummvm-rg350-9921273f182c400e8f95186f0638b6c2233e37aa.tar.gz scummvm-rg350-9921273f182c400e8f95186f0638b6c2233e37aa.tar.bz2 scummvm-rg350-9921273f182c400e8f95186f0638b6c2233e37aa.zip | |
fixed compilation for VC6
svn-id: r6699
| -rw-r--r-- | sky/disk.cpp | 2 | ||||
| -rw-r--r-- | sky/rnc_deco.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sky/disk.cpp b/sky/disk.cpp index 0827fdeeef..2a74f66802 100644 --- a/sky/disk.cpp +++ b/sky/disk.cpp @@ -30,7 +30,7 @@ #define no_of_files_cd 5200 #define max_files_in_list 60 -uint32 UnpackM1(void *, void *, uint16); +int UnpackM1(void *, void *, uint16); const char *data_file_name = "sky.dsk"; const char *dinner_file_name = "sky.dnr"; diff --git a/sky/rnc_deco.cpp b/sky/rnc_deco.cpp index 370861879c..6604de71d6 100644 --- a/sky/rnc_deco.cpp +++ b/sky/rnc_deco.cpp @@ -131,7 +131,7 @@ uint16 input_bits(uint8 amount) remBits = ROR((uint16)(((1 << amount) - 1) & newBitBuffh), amount); bit_buffh = newBitBuffh >> amount; bit_buffl = (newBitBuffl >> amount) | remBits; - bit_count = newBitCount; + bit_count = (uint8)newBitCount; return returnVal; |