The-Homebrew-Cloud/fbzx-wii
2
0
Fork 0
mirror of https://github.com/Oibaf66/fbzx-wii.git synced 2024-12-01 04:24:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Load cartridge roms shorter than 16KB too

Browse Source
This commit is contained in:
fabio.olimpieri 2014-05-17 07:44:15 +00:00
parent f9825294f7
commit 47dac68363
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/emulator.c
View File

@ -373,7 +373,7 @@ char *load_a_rom(char **filenames) {
return (NULL); return (NULL);
} }
char *load_rom_cartridge(void) { void load_rom_cartridge(void) {
FILE *fichero; FILE *fichero;
int size; int size;
@ -381,13 +381,11 @@ char *load_rom_cartridge(void) {
printf("Opening %s\n", rom_cartridge); printf("Opening %s\n", rom_cartridge);
fichero=fopen(rom_cartridge,"rb"); fichero=fopen(rom_cartridge,"rb");
if(fichero==NULL) { if(fichero==NULL) {
return (rom_cartridge); return;
} }
size=fread(ordenador.memoria,1,16384,fichero); size=fread(ordenador.memoria,1,16384,fichero);
if (size != 16384) return (rom_cartridge);
fclose(fichero); fclose(fichero);
return (0);
} }
void load_rom(char type) { void load_rom(char type) {
@ -399,9 +397,6 @@ void load_rom(char type) {
switch(type) { switch(type) {
case 0: case 0:
if (rom_cartridge[0])
{if (load_rom_cartridge()) {msgInfo("Cartridge must be 16KB long", 3000, NULL);} else break;}
if (ordenador.se_basic) filenames[0]="spectrum-roms/opense.rom"; else filenames[0]="spectrum-roms/48.rom"; if (ordenador.se_basic) filenames[0]="spectrum-roms/opense.rom"; else filenames[0]="spectrum-roms/48.rom";
filenames[1]=NULL; filenames[1]=NULL;
retval=load_a_rom(filenames); retval=load_a_rom(filenames);
@ -409,6 +404,8 @@ void load_rom(char type) {
printf("Can't load file %s\n",retval); printf("Can't load file %s\n",retval);
exit(1); exit(1);
} }
if (rom_cartridge[0]) load_rom_cartridge();
break; break;
case 1: case 1:
filenames[0]="spectrum-roms/128-0.rom"; filenames[0]="spectrum-roms/128-0.rom";