ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GB: Fix loading model overrides

This commit is contained in:
Vicki Pfau 2021-03-21 15:54:35 -07:00
parent 49b12139ec
commit b8b494eea6
3 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -82,6 +82,7 @@ Other fixes:
- FFmpeg: Fix some small memory leaks - FFmpeg: Fix some small memory leaks
- FFmpeg: Fix encoding of time base - FFmpeg: Fix encoding of time base
- GB: Fix crash when changing ROM while in banked address space - GB: Fix crash when changing ROM while in banked address space
- GB: Fix loading model overrides
- GB Video: Fix SGB video logs - GB Video: Fix SGB video logs
- GBA: Fix loading multiboot ELF files (fixes mgba.io/i/1949) - GBA: Fix loading multiboot ELF files (fixes mgba.io/i/1949)
- GBA: Fix loading subsequent save files (fixes mgba.io/i/2067) - GBA: Fix loading subsequent save files (fixes mgba.io/i/2067)

73
src/gb/core.c
View File

@ -443,44 +443,45 @@ static void _GBCoreReset(struct mCore* core) {
struct GBCartridgeOverride override; struct GBCartridgeOverride override;
const struct GBCartridge* cart = (const struct GBCartridge*) &gb->memory.rom[0x100]; const struct GBCartridge* cart = (const struct GBCartridge*) &gb->memory.rom[0x100];
override.headerCrc32 = doCrc32(cart, sizeof(*cart)); override.headerCrc32 = doCrc32(cart, sizeof(*cart));
if (GBOverrideFind(gbcore->overrides, &override) || (doColorOverride && GBOverrideColorFind(&override))) { bool modelOverride = GBOverrideFind(gbcore->overrides, &override) || (doColorOverride && GBOverrideColorFind(&override));
if (modelOverride) {
GBOverrideApply(gb, &override); GBOverrideApply(gb, &override);
} } else {
const char* modelGB = mCoreConfigGetValue(&core->config, "gb.model");
const char* modelGB = mCoreConfigGetValue(&core->config, "gb.model"); const char* modelSGB = mCoreConfigGetValue(&core->config, "sgb.model");
const char* modelSGB = mCoreConfigGetValue(&core->config, "sgb.model"); const char* modelCGB = mCoreConfigGetValue(&core->config, "cgb.model");
const char* modelCGB = mCoreConfigGetValue(&core->config, "cgb.model"); const char* modelCGBHybrid = mCoreConfigGetValue(&core->config, "cgb.hybridModel");
const char* modelCGBHybrid = mCoreConfigGetValue(&core->config, "cgb.hybridModel"); const char* modelCGBSGB = mCoreConfigGetValue(&core->config, "cgb.sgbModel");
const char* modelCGBSGB = mCoreConfigGetValue(&core->config, "cgb.sgbModel"); if (modelGB || modelCGB || modelSGB || modelCGBHybrid || modelCGBSGB) {
if (modelGB || modelCGB || modelSGB || modelCGBHybrid || modelCGBSGB) { int models = GBValidModels(gb->memory.rom);
int models = GBValidModels(gb->memory.rom); switch (models) {
switch (models) { case GB_MODEL_SGB | GB_MODEL_MGB:
case GB_MODEL_SGB | GB_MODEL_MGB: if (modelSGB) {
if (modelSGB) { gb->model = GBNameToModel(modelSGB);
gb->model = GBNameToModel(modelSGB); }
break;
case GB_MODEL_MGB:
if (modelGB) {
gb->model = GBNameToModel(modelGB);
}
break;
case GB_MODEL_MGB | GB_MODEL_CGB:
if (modelCGBHybrid) {
gb->model = GBNameToModel(modelCGBHybrid);
}
break;
case GB_MODEL_SGB | GB_MODEL_CGB: // TODO: Do these even exist?
case GB_MODEL_MGB | GB_MODEL_SGB | GB_MODEL_CGB:
if (modelCGBSGB) {
gb->model = GBNameToModel(modelCGBSGB);
}
break;
case GB_MODEL_CGB:
if (modelCGB) {
gb->model = GBNameToModel(modelCGB);
}
break;
} }
break;
case GB_MODEL_MGB:
if (modelGB) {
gb->model = GBNameToModel(modelGB);
}
break;
case GB_MODEL_MGB | GB_MODEL_CGB:
if (modelCGBHybrid) {
gb->model = GBNameToModel(modelCGBHybrid);
}
break;
case GB_MODEL_SGB | GB_MODEL_CGB: // TODO: Do these even exist?
case GB_MODEL_MGB | GB_MODEL_SGB | GB_MODEL_CGB:
if (modelCGBSGB) {
gb->model = GBNameToModel(modelCGBSGB);
}
break;
case GB_MODEL_CGB:
if (modelCGB) {
gb->model = GBNameToModel(modelCGB);
}
break;
} }
} }
} }

2
src/gb/overrides.c
View File

@ -638,6 +638,8 @@ void GBOverrideSave(struct Configuration* config, const struct GBCartridgeOverri
void GBOverrideApply(struct GB* gb, const struct GBCartridgeOverride* override) { void GBOverrideApply(struct GB* gb, const struct GBCartridgeOverride* override) {
if (override->model != GB_MODEL_AUTODETECT) { if (override->model != GB_MODEL_AUTODETECT) {
gb->model = override->model; gb->model = override->model;
gb->video.renderer->deinit(gb->video.renderer);
gb->video.renderer->init(gb->video.renderer, gb->model, gb->video.sgbBorders);
} }
if (override->mbc != GB_MBC_AUTODETECT) { if (override->mbc != GB_MBC_AUTODETECT) {