--- Frodo4/Src/main.cpp	2003/07/01 17:20:58	1.2
+++ Frodo4/Src/main.cpp	2004/01/11 14:03:29	1.6
@@ -1,7 +1,7 @@
 /*
  *  main.cpp - Main program
  *
- *  Frodo (C) 1994-1997,2002 Christian Bauer
+ *  Frodo (C) 1994-1997,2002-2003 Christian Bauer
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -28,80 +28,60 @@
 
 
 // Global variables
+C64 *TheC64 = NULL;		// Global C64 object
 char AppDirPath[1024];	// Path of application directory
 
 
 // ROM file names
+#ifndef DATADIR
+#define DATADIR
+#endif
+
 #ifdef __riscos__
 #define BASIC_ROM_FILE	"FrodoRsrc:Basic_ROM"
 #define KERNAL_ROM_FILE	"FrodoRsrc:Kernal_ROM"
 #define CHAR_ROM_FILE	"FrodoRsrc:Char_ROM"
-#define FLOPPY_ROM_FILE	"FrodoRsrc:1541_ROM"
+#define DRIVE_ROM_FILE	"FrodoRsrc:1541_ROM"
 #else
-#define BASIC_ROM_FILE	"Basic ROM"
-#define KERNAL_ROM_FILE	"Kernal ROM"
-#define CHAR_ROM_FILE	"Char ROM"
-#define FLOPPY_ROM_FILE	"1541 ROM"
+#define BASIC_ROM_FILE DATADIR "Basic ROM"
+#define KERNAL_ROM_FILE DATADIR "Kernal ROM"
+#define CHAR_ROM_FILE DATADIR "Char ROM"
+#define DRIVE_ROM_FILE DATADIR "1541 ROM"
 #endif
 
 
+// Builtin ROMs
+#include "Basic_ROM.h"
+#include "Kernal_ROM.h"
+#include "Char_ROM.h"
+#include "1541_ROM.h"
+
+
 /*
  *  Load C64 ROM files
  */
 
-bool Frodo::load_rom_files(void)
+void Frodo::load_rom(const char *which, const char *path, uint8 *where, size_t size, const uint8 *builtin)
 {
-	FILE *file;
-
-	// Load Basic ROM
-	if ((file = fopen(BASIC_ROM_FILE, "rb")) != NULL) {
-		if (fread(TheC64->Basic, 1, 0x2000, file) != 0x2000) {
-			ShowRequester("Can't read 'Basic ROM'.", "Quit");
-			return false;
-		}
-		fclose(file);
-	} else {
-		ShowRequester("Can't find 'Basic ROM'.", "Quit");
-		return false;
-	}
-
-	// Load Kernal ROM
-	if ((file = fopen(KERNAL_ROM_FILE, "rb")) != NULL) {
-		if (fread(TheC64->Kernal, 1, 0x2000, file) != 0x2000) {
-			ShowRequester("Can't read 'Kernal ROM'.", "Quit");
-			return false;
-		}
-		fclose(file);
-	} else {
-		ShowRequester("Can't find 'Kernal ROM'.", "Quit");
-		return false;
-	}
-
-	// Load Char ROM
-	if ((file = fopen(CHAR_ROM_FILE, "rb")) != NULL) {
-		if (fread(TheC64->Char, 1, 0x1000, file) != 0x1000) {
-			ShowRequester("Can't read 'Char ROM'.", "Quit");
-			return false;
-		}
-		fclose(file);
-	} else {
-		ShowRequester("Can't find 'Char ROM'.", "Quit");
-		return false;
+	FILE *f = fopen(path, "rb");
+	if (f) {
+		size_t actual = fread(where, 1, size, f);
+		fclose(f);
+		if (actual == size)
+			return;
 	}
 
-	// Load 1541 ROM
-	if ((file = fopen(FLOPPY_ROM_FILE, "rb")) != NULL) {
-		if (fread(TheC64->ROM1541, 1, 0x4000, file) != 0x4000) {
-			ShowRequester("Can't read '1541 ROM'.", "Quit");
-			return false;
-		}
-		fclose(file);
-	} else {
-		ShowRequester("Can't find '1541 ROM'.", "Quit");
-		return false;
-	}
+	// Use builtin ROM
+	printf("%s ROM file (%s) not readable, using builtin.\n", which, path);
+	memcpy(where, builtin, size);
+}
 
-	return true;
+void Frodo::load_rom_files()
+{
+	load_rom("Basic", BASIC_ROM_FILE, TheC64->Basic, BASIC_ROM_SIZE, builtin_basic_rom);
+	load_rom("Kernal", KERNAL_ROM_FILE, TheC64->Kernal, KERNAL_ROM_SIZE, builtin_kernal_rom);
+	load_rom("Char", CHAR_ROM_FILE, TheC64->Char, CHAR_ROM_SIZE, builtin_char_rom);
+	load_rom("1541", DRIVE_ROM_FILE, TheC64->ROM1541, DRIVE_ROM_SIZE, builtin_drive_rom);
 }