From df4900828c60d9df26827b0a6c969b213ac6250f Mon Sep 17 00:00:00 2001 From: Thomas Jentzsch Date: Wed, 13 Apr 2022 11:27:53 +0200 Subject: [PATCH] added regex for PAL-N in filename (->NTSC50) --- Changes.txt | 2 ++ docs/index.html | 4 ++-- src/emucore/Console.cxx | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Changes.txt b/Changes.txt index b3223ae83..f46e33e52 100644 --- a/Changes.txt +++ b/Changes.txt @@ -57,6 +57,8 @@ * Debugger: fixed patching code in ZP-RAM. + * Debugger: improved bank origin detection. + -Have fun! diff --git a/docs/index.html b/docs/index.html index d3feb83bc..0bff6559c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -5130,10 +5130,10 @@ Ms Pac-Man (Stella extended codes): by using one of the following pattern in the filename. - + - +
 Format Filename Pattern (to force format)
NTSCNTSC, NTSC60, NTSC 60, NTSC-60
NTSCNTSC, NTSC60, NTSC 60, NTSC-60, PAL-M
PALPAL, PAL50, PAL 50, PAL-50
SECAM ¹SECAM, SECAM50, SECAM 50, SECAM-50
NTSC50 ¹NTSC50, NTSC 50, NTSC-50
NTSC50 ¹NTSC50, NTSC 50, NTSC-50, PAL-N
PAL60 ¹PAL60, PAL 60, PAL-60
SECAM60 ¹SECAM60, SECAM 60, SECAM-60
diff --git a/src/emucore/Console.cxx b/src/emucore/Console.cxx index ae60d83b7..8d3801023 100644 --- a/src/emucore/Console.cxx +++ b/src/emucore/Console.cxx @@ -317,8 +317,9 @@ void Console::redetectFrameLayout() // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - string Console::formatFromFilename() const { - static const BSPF::array2D Pattern = {{ + static const BSPF::array2D Pattern = {{ { R"([ _\-(\[<]+NTSC[ _-]?50)", "NTSC50" }, + { R"([ _\-(\[<]+PAL[ _-]?N[ _\-)\]>.])", "NTSC50" }, // PAL-N == NTSC50 { R"([ _\-(\[<]+PAL[ _-]?60)", "PAL60" }, { R"([ _\-(\[<]+SECAM[ _-]?60)", "SECAM60" }, { R"([ _\-(\[<]+NTSC[ _\-)\]>.])", "NTSC" },