From 0c217c2e8cbc29cfa49a7d5a1fc29086d14384b2 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 13 Nov 2016 03:47:40 -0800
Subject: CRYO: Remove CLFILE_MakeStruct and filespec_t

---
 engines/cryo/cryolib.cpp | 6 ------
 engines/cryo/cryolib.h   | 1 -
 engines/cryo/eden.cpp    | 6 ++----
 engines/cryo/eden.h      | 1 -
 engines/cryo/platdefs.h  | 5 -----
 5 files changed, 2 insertions(+), 17 deletions(-)

(limited to 'engines/cryo')

diff --git a/engines/cryo/cryolib.cpp b/engines/cryo/cryolib.cpp
index 3b1967bfb9..f8fd27e3a7 100644
--- a/engines/cryo/cryolib.cpp
+++ b/engines/cryo/cryolib.cpp
@@ -356,12 +356,6 @@ uint16 CLMouse_IsDown() {
 }
 
 ///// CLFile
-
-void CLFile_MakeStruct(int a3, int a4, const char *name, filespec_t *fs) {
-	strcpy(fs->name, name);
-	fs->create = 0;
-}
-
 void CLFile_Write(file_t &handle, void *buffer, int32 *size) {
 	assert(0);
 }
diff --git a/engines/cryo/cryolib.h b/engines/cryo/cryolib.h
index 94964e05de..29901c48aa 100644
--- a/engines/cryo/cryolib.h
+++ b/engines/cryo/cryolib.h
@@ -214,7 +214,6 @@ void CLPalette_DeactivateInterval();
 void CLPalette_Send2Screen(struct color_t *palette, uint16 first, uint16 count);
 void CLPalette_BeSystem();
 
-void CLFile_MakeStruct(int a3, int a4, const char *name, filespec_t *fs);
 void CLFile_Write(file_t &handle, void *buffer, int32 *size);
 
 void CLSound_PrepareSample(sound_t *sound, int16 mode);
diff --git a/engines/cryo/eden.cpp b/engines/cryo/eden.cpp
index 45f186b297..27f11ca6c8 100644
--- a/engines/cryo/eden.cpp
+++ b/engines/cryo/eden.cpp
@@ -4664,8 +4664,7 @@ void EdenGame::verifh(void *ptr) {
 void EdenGame::openbigfile() {
 	assert(sizeof(pakfile_t) == 25);
 	int32 size = 0x10000;
-	CLFile_MakeStruct(0, 0, "EDEN.DAT", &bigfilespec);
-	h_bigfile.open(bigfilespec.name);
+	h_bigfile.open("EDEN.DAT");
 	h_bigfile.read(bigfile_header, size);
 
 	_hnmContext = CLHNM_New(128);
@@ -4678,9 +4677,8 @@ void EdenGame::closebigfile() {
 
 void EdenGame::loadFile(uint16 num, void *buffer) {
 	if (_vm->getPlatform() == Common::kPlatformDOS) {
-		if ((_vm->isDemo() && num > 2204) || num > 2472) {
+		if ((_vm->isDemo() && num > 2204) || num > 2472)
 			error("Trying to read invalid game resource");
-		}
 	}
 
 	assert(num < bigfile_header->count);
diff --git a/engines/cryo/eden.h b/engines/cryo/eden.h
index 9bede6b6d0..8e3faed85b 100644
--- a/engines/cryo/eden.h
+++ b/engines/cryo/eden.h
@@ -657,7 +657,6 @@ private:
 	View          *p_mainview;
 	View          *p_hnmview;
 	hnm_t           *_hnmContext;
-	filespec_t      bigfilespec;
 	Common::Rect _underSubtitlesBackupRect;
 	Common::Rect _underSubtitlesScreenRect;
 	Common::Rect _underBottomBarBackupRect;
diff --git a/engines/cryo/platdefs.h b/engines/cryo/platdefs.h
index f53860ce52..302890e417 100644
--- a/engines/cryo/platdefs.h
+++ b/engines/cryo/platdefs.h
@@ -30,11 +30,6 @@ namespace Cryo {
 
 typedef Common::File file_t;
 
-struct filespec_t {
-	char    create;
-	char    name[260];
-};
-
 #if 1
 const int subtitles_x_margin = 16;          //PC
 const int subtitles_x_scr_margin = 16;
-- 
cgit v1.2.3