Only apply the RemoveFBBlackBars fix to NTSC roms

libretro · Mar 24, 2022 · fb283dc · fb283dc
1 parent 5c55cbd
commit fb283dc
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/libretro/libretro.c b/libretro/libretro.c
@@ -872,10 +872,7 @@ void retro_set_environment(retro_environment_t cb)
 void retro_get_system_info(struct retro_system_info *info)
 {
    info->library_name = "ParaLLEl N64";
-#ifndef GIT_VERSION
-#define GIT_VERSION ""
-#endif
-   info->library_version = "2.0-rc2" GIT_VERSION;
+   info->library_version = "2.0.1 (Parallel Launcher Edition)";
    info->valid_extensions = "n64|v64|z64|bin|u1|ndd";
    info->need_fullpath = false;
    info->block_extract = false;

diff --git a/libretro/libretro_core_options.h b/libretro/libretro_core_options.h
@@ -1613,7 +1613,7 @@ struct retro_core_option_v2_definition option_defs_us[] = {
     },
     {
         CORE_NAME "-gliden64-RemoveFBBlackBars",
-        "Patch SM64 Hacks made with SM64 Editor",
+        "Fix VI Resolution",
         NULL,
         "(GLideN64) Remove the black bars added by VI emulation of the FrameBuffer.",
         "Remove the black bars added by VI emulation of the FrameBuffer.",

diff --git a/mupen64plus-video-gliden64/src/FrameBuffer.cpp b/mupen64plus-video-gliden64/src/FrameBuffer.cpp
@@ -1345,7 +1345,7 @@ void FrameBufferList::renderBuffer()
 		return;
 	}
 
-	if (RemoveFBBlackBars)
+	if (RemoveFBBlackBars && !rdpRes.vi_ispal)
 	{
 		rdpRes.vi_vres = 240;
 		rdpRes.vi_minhpass = 0;

diff --git a/scripts/build-nix64.sh b/scripts/build-nix64.sh