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

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);