Revert "Add core option to force DMG mode"

It breaks the GBA mode option, and calling gb.load() twice is just terrible coding.

This reverts commit 6d4e62e98c, PR #40.
This commit is contained in:
Alcaro 2015-06-14 12:21:36 +02:00
parent 627c1191aa
commit 78a94cd889

View File

@ -150,7 +150,6 @@ void retro_set_environment(retro_environment_t cb)
{ "gambatte_gb_gbamode", "GBA mode; disabled|enabled" },
{ "gambatte_gb_colorization", "GB Colorization; disabled|enabled|custom" },
{ "gambatte_gbc_color_correction", "Color correction; enabled|disabled" },
{ "gambatte_gb_force_dmg", "Force DMG Mode; disabled|enabled" },
{ NULL, NULL },
};
@ -483,13 +482,6 @@ bool retro_load_game(const struct retro_game_info *info)
if (gb.load(info->data, info->size, gbamode ? gambatte::GB::GBA_CGB : 0) != 0)
return false;
bool force_dmg = false;
var.key = "gambatte_gb_force_dmg";
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value && !strcmp(var.value, "enabled")) force_dmg=true;
if (gb.load(info->data, info->size, force_dmg ? gambatte::GB::FORCE_DMG : 0) != 0)
return false;
rom_path = info->path ? info->path : "";
strncpy(internal_game_name, (const char*)info->data + 0x134, sizeof(internal_game_name) - 1);
internal_game_name[sizeof(internal_game_name)-1]='\0';