diff options
author | Joost Peters | 2003-03-06 15:35:07 +0000 |
---|---|---|
committer | Joost Peters | 2003-03-06 15:35:07 +0000 |
commit | 730d528a543543f2c6ff3324c421b742eb8f1c4f (patch) | |
tree | 1b8a418abe4b3a7bb6ee80e1b56f798f48dcecec /sky/disk.cpp | |
parent | f8475649da19d402821b9da8c56b980887169ff5 (diff) | |
download | scummvm-rg350-730d528a543543f2c6ff3324c421b742eb8f1c4f.tar.gz scummvm-rg350-730d528a543543f2c6ff3324c421b742eb8f1c4f.tar.bz2 scummvm-rg350-730d528a543543f2c6ff3324c421b742eb8f1c4f.zip |
Major cleanup in rnc_deco.cpp, is now a seperate RncDecoder class, modified disk.cpp to use the class + added rnc_deco.h
svn-id: r6712
Diffstat (limited to 'sky/disk.cpp')
-rw-r--r-- | sky/disk.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sky/disk.cpp b/sky/disk.cpp index b628aa4ab0..4f98f47fcb 100644 --- a/sky/disk.cpp +++ b/sky/disk.cpp @@ -25,13 +25,12 @@ #include "common/file.h" #include "sky/skydefs.h" #include "sky/sky.h" +#include "sky/rnc_deco.h" #define no_of_files_hd 1600 #define no_of_files_cd 5200 #define max_files_in_list 60 -int32 UnpackM1(void *, void *, uint16); - const char *data_file_name = "sky.dsk"; const char *dinner_file_name = "sky.dnr"; uint8 *dinner_table_area, *fixed_dest, *file_dest, *comp_dest; @@ -151,7 +150,8 @@ uint16 *SkyState::load_file(uint16 file_nr, uint8 *dest) outputPtr += sizeof(struct dataFileHeader); } - int32 unPackLen = UnpackM1(inputPtr, outputPtr, 0); + RncDecoder rncDecoder; + int32 unPackLen = rncDecoder.unpackM1(inputPtr, outputPtr, 0); debug(2, "UnpackM1 returned: %d", unPackLen); |