CRYO: Replace file_t by Common::File

7 files changed, 8 insertions, 10 deletions

diff --git a/engines/cryo/cryolib.cpp b/engines/cryo/cryolib.cpp
index 368699e632..dd7afe9fd1 100644
--- a/engines/cryo/cryolib.cpp
+++ b/engines/cryo/cryolib.cpp
@@ -350,7 +350,7 @@ uint16 CLMouse_IsDown() {
 }
 
 ///// CLFile
-void CLFile_Write(file_t &handle, void *buffer, int32 *size) {
+void CLFile_Write(Common::File &handle, void *buffer, int32 *size) {
 	assert(0);
 }
 
diff --git a/engines/cryo/cryolib.h b/engines/cryo/cryolib.h
index 7e1ec1a338..71d58f3676 100644
--- a/engines/cryo/cryolib.h
+++ b/engines/cryo/cryolib.h
@@ -120,7 +120,7 @@ typedef struct HNMHeader HNMHeader;
 struct hnm_t {
 	int  _frameNum;
 	int  ff_4;
-	file_t  *_file;
+	Common::File *_file;
 	HNMHeader     _header;
 	byte   *tmpBuffer[2];
 	byte   *finalBuffer;
@@ -204,7 +204,7 @@ void CLPalette_DeactivateInterval();
 void CLPalette_Send2Screen(struct color_t *palette, uint16 first, uint16 count);
 void CLPalette_BeSystem();
 
-void CLFile_Write(file_t &handle, void *buffer, int32 *size);
+void CLFile_Write(Common::File &handle, void *buffer, int32 *size);
 
 void CLSound_PrepareSample(sound_t *sound, int16 mode);
 void CLSound_SetWantsDesigned(int16 designed);
diff --git a/engines/cryo/eden.cpp b/engines/cryo/eden.cpp
index 6db7d5b102..32c9e73c58 100644
--- a/engines/cryo/eden.cpp
+++ b/engines/cryo/eden.cpp
@@ -8023,7 +8023,7 @@ void EdenGame::phase560() {
 //// saveload.c
 void EdenGame::savegame(char *name) {
 //	filespec_t fs;
-//	file_t handle;
+//	Common::File handle;
 	int32 size;
 //	CLFile_MakeStruct(0, 0, name, &fs);
 //	CLFile_Create(&fs);
@@ -8121,7 +8121,7 @@ void EdenGame::loadrestart() {
 
 void EdenGame::loadgame(char *name) {
 //	filespec_t fs;
-//	file_t handle;
+//	Common::File handle;
 //	CLFile_MakeStruct(0, 0, name, &fs);
 //	CLFile_Open(&fs, 3, handle);
 
diff --git a/engines/cryo/eden.h b/engines/cryo/eden.h
index 9ac4f8241c..a3059c3f31 100644
--- a/engines/cryo/eden.h
+++ b/engines/cryo/eden.h
@@ -613,7 +613,7 @@ private:
 	color_t         newPalette[256];
 	Common::Rect          rect_dst, rect_src;
 	void            *voiceSamplesBuffer;    //TODO: sound sample buffer
-	file_t          h_bigfile;
+	Common::File h_bigfile;
 	byte   info_list[16];
 	bool needToFade;
 	byte   lastMusicNum;
diff --git a/engines/cryo/platdefs.h b/engines/cryo/platdefs.h
index 302890e417..60bb5c29ce 100644
--- a/engines/cryo/platdefs.h
+++ b/engines/cryo/platdefs.h
@@ -28,8 +28,6 @@
 
 namespace Cryo {
 
-typedef Common::File file_t;
-
 #if 1
 const int subtitles_x_margin = 16;          //PC
 const int subtitles_x_scr_margin = 16;
diff --git a/engines/cryo/video.cpp b/engines/cryo/video.cpp
index 6cf90535e1..f76da76f60 100644
--- a/engines/cryo/video.cpp
+++ b/engines/cryo/video.cpp
@@ -74,7 +74,7 @@ hnm_t *HnmPlayer::resetInternals() {
 }
 
 // Original name: CLHNM_SetFile
-void HnmPlayer::setFile(hnm_t *hnm, file_t *file) {
+void HnmPlayer::setFile(hnm_t *hnm, Common::File *file) {
 	hnm->_file = file;
 }
 
diff --git a/engines/cryo/video.h b/engines/cryo/video.h
index a3a2f6dab6..5d2e5999fe 100644
--- a/engines/cryo/video.h
+++ b/engines/cryo/video.h
@@ -97,7 +97,7 @@ public:
 	void setFinalBuffer(hnm_t *hnm, byte *buffer);
 	int getFrameNum(hnm_t *hnm);
 	hnm_t *resetInternals();
-	void setFile(hnm_t *hnm, file_t *file);
+	void setFile(hnm_t *hnm, Common::File *file);
 
 	soundchannel_t *getSoundChannel();
 };