Merge pull request #6 from ficoos/PAL_fix

Fix crash when loading PAL games
This commit is contained in:
Squarepusher 2012-10-06 09:42:27 -07:00
commit 895970399a
2 changed files with 4 additions and 4 deletions

View File

@ -85,7 +85,7 @@ bool retro_load_game(const struct retro_game_info *info)
return false;
int fbWidth = 680;
int fbHeight = 480;
int fbHeight = 576;
int fbSize = fbWidth * fbHeight;
conv_buf = new uint16_t[fbSize];

View File

@ -1217,8 +1217,8 @@ static int LoadCD(std::vector<CDIF *> *CDInterfaces)
int ret = InitCommon(CDInterfaces);
// TODO: fastboot setting
//if(MDFN_GetSettingB("psx.fastboot"))
BIOSROM->WriteU32(0x6990, 0);
if(MDFN_GetSettingB("psx.fastboot"))
BIOSROM->WriteU32(0x6990, 0);
MDFNGameInfo->GameType = GMT_CDROM;
@ -1457,7 +1457,7 @@ static MDFNSetting PSXSettings[] =
{ "psx.input.port8.memcard", MDFNSF_EMU_STATE | MDFNSF_UNTRUSTED_SAFE, gettext_noop("Emulate memcard on port 2D."), NULL, MDFNST_BOOL, "1", NULL, NULL, },
//{ "psx.fastboot", MDFNSF_EMU_STATE | MDFNSF_UNTRUSTED_SAFE, gettext_noop("Skip BIOS intro sequence."), gettext_noop("MAY BREAK GAMES."), MDFNST_BOOL, "0" },
{ "psx.fastboot", MDFNSF_EMU_STATE | MDFNSF_UNTRUSTED_SAFE, gettext_noop("Skip BIOS intro sequence."), gettext_noop("MAY BREAK GAMES."), MDFNST_BOOL, "1" },
{ "psx.region_autodetect", MDFNSF_EMU_STATE | MDFNSF_UNTRUSTED_SAFE, gettext_noop("Attempt to auto-detect region of game."), NULL, MDFNST_BOOL, "1" },
{ "psx.region_default", MDFNSF_EMU_STATE | MDFNSF_UNTRUSTED_SAFE, gettext_noop("Default region to use."), gettext_noop("Used if region autodetection fails or is disabled."), MDFNST_ENUM, "jp", NULL, NULL, NULL, NULL, Region_List },