Clean up ZQ errors, add fonts.dat size error message

Author: EmilyV99

src/base/zdefs.cpp

@@ -2092,3 +2092,17 @@ const int BUILDTM_SECOND = (
 	(__TIME__[7]-'0'));
 
 
+size_t datcnt = 0;
+void dat_callback(DATAFILE*)
+{
+	++datcnt;
+}
+DATAFILE* load_datafile_count(const char* path, size_t& sz)
+{
+	datcnt = 0;
+	DATAFILE* ret = load_datafile_callback(path,dat_callback);
+	if(ret)
+		sz = datcnt-1;
+	else sz = 0;
+	return ret;
+}

src/base/zdefs.h

@@ -5696,6 +5696,10 @@ bool isDamageType(int32_t type);
 bool isConveyorType(int32_t type);
 bool isChestType(int32_t type);
 
+DATAFILE* load_datafile_count(const char* path, size_t& sz);
+
+#define FONTSDAT_CNT (FONT_ZX+1)
+
 #define SMART_WRAP(x, mod) ((x) < 0 ? (((mod)-(-(x)%(mod)))%(mod)) : ((x)%(mod)))
 #define MEMCPY_ARR(dest,src) memcpy(dest,src,sizeof(dest))
 

src/launcher/launcher.cpp

@@ -7,6 +7,7 @@
 #include "dialog/alert.h"
 #include "launcher_dialog.h"
 #include "base/zapp.h"
+#include "fontsdat.h"
 
 #define QUICK_EXIT 0
 
@@ -18,6 +19,7 @@ do{ \
 while(false)
 
 DATAFILE *fontsdata;
+size_t fontsdat_cnt = 0;
 PALETTE RAMpal;
 
 ZModule zcm;
@@ -152,7 +154,7 @@ int32_t main(int32_t argc, char* argv[])
 	packfile_password(datapwd);
 
 	Z_message("....Fonts.Dat..."); //{
-	if((fontsdata=load_datafile(moduledata.datafiles[fonts_dat]))==NULL)
+	if((fontsdata=load_datafile_count(moduledata.datafiles[fonts_dat], fontsdat_cnt))==NULL)
 	{
 		Z_error_fatal("failed: load error\n");
 		QUIT_LAUNCHER();
@@ -164,6 +166,11 @@ int32_t main(int32_t argc, char* argv[])
 		Z_error_fatal("failed: version error\n");
 		QUIT_LAUNCHER();
 	}
+	if(fontsdat_cnt != FONTSDAT_CNT)
+	{
+		Z_error_fatal("failed: count error (found %d != exp %d)\n", fontsdat_cnt, FONTSDAT_CNT);
+		QUIT_LAUNCHER();
+	}
 	Z_message("OK\n");
 	//} end Fonts.Dat...OK
 	packfile_password("");

src/zc/zelda.cpp

@@ -335,6 +335,7 @@ BITMAP     *framebuf, *menu_bmp, *gui_bmp, *scrollbuf, *tmp_bmp, *tmp_scr, *scre
 		   *script_menu_buf, *f6_menu_buf;
 BITMAP     *zcmouse[NUM_ZCMOUSE];
 DATAFILE   *datafile, *sfxdata, *fontsdata, *mididata;
+size_t fontsdat_cnt = 0;
 PALETTE    RAMpal;
 byte       *colordata, *trashbuf;
 //byte       *tilebuf;
@@ -4810,11 +4811,16 @@ int main(int argc, char **argv)
 
 	Z_message("Fonts.Dat...");
 
-	if((fontsdata=load_datafile(moduledata.datafiles[fonts_dat]))==NULL)
+	if((fontsdata=load_datafile_count(moduledata.datafiles[fonts_dat], fontsdat_cnt))==NULL)
 	{
 		Z_error_fatal("failed");
 		quit_game();
 	}
+	if(fontsdat_cnt != FONTSDAT_CNT)
+	{
+		Z_error_fatal("failed: count error (found %d != exp %d)\n", fontsdat_cnt, FONTSDAT_CNT);
+		quit_game();
+	}
 
 	if(strncmp((char*)fontsdata[0].dat,fontsdat_sig,24))
 	{

src/zc/zelda.h

@@ -315,6 +315,7 @@ extern bool lightbeam_present;
 #define NUM_ZCMOUSE 1
 extern BITMAP *zcmouse[NUM_ZCMOUSE];
 extern DATAFILE *datafile, *sfxdata, *fontsdata, *mididata;
+extern size_t fontsdat_cnt;
 extern SAMPLE   wav_refill;
 extern PALETTE  RAMpal;
 extern byte     *colordata;