From 56594840ada308e2e024ce563f1786c7b04df228 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Mon, 19 Jul 2021 10:09:45 +1000
Subject: [PATCH] Replace sequences of 7 or more = chars in C# source with -
just makes it easier to grep for Git merge conflicts
---
src/BizHawk.Client.Common/DisplayManager/Filters/Retro.cs | 2 +-
src/BizHawk.Common/Log.cs | 6 +++---
.../Consoles/Sega/SMS/MemoryMap.CodeMasters.cs | 8 ++++----
.../Consoles/Sega/SMS/MemoryMap.Korea.cs | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/BizHawk.Client.Common/DisplayManager/Filters/Retro.cs b/src/BizHawk.Client.Common/DisplayManager/Filters/Retro.cs
index 9b4bfdf65b..470db75088 100644
--- a/src/BizHawk.Client.Common/DisplayManager/Filters/Retro.cs
+++ b/src/BizHawk.Client.Common/DisplayManager/Filters/Retro.cs
@@ -75,7 +75,7 @@ namespace BizHawk.Client.Common.Filters
var shader = shaders[i] = new RetroShader(Owner, content, debug);
if (!shader.Available)
{
- Errors += $"===================\r\nPass {i}:\r\n{(shader.Errors??"").Replace("\n","\r\n")}\n";
+ Errors += $"-------------------\r\nPass {i}:\r\n{(shader.Errors??"").Replace("\n","\r\n")}\n";
return;
}
}
diff --git a/src/BizHawk.Common/Log.cs b/src/BizHawk.Common/Log.cs
index 584037b03c..b6d8c7a759 100644
--- a/src/BizHawk.Common/Log.cs
+++ b/src/BizHawk.Common/Log.cs
@@ -19,7 +19,7 @@ namespace BizHawk.Common
//EnableDomain("MEM");
}
- // ============== Logging Domain Configuration ==============
+ // -------------- Logging Domain Configuration --------------
private static readonly List<string> EnabledLogDomains = new List<string>();
public static void EnableDomain(string domain)
@@ -38,7 +38,7 @@ namespace BizHawk.Common
}
}
- // ============== Logging Action Configuration ==============
+ // -------------- Logging Action Configuration --------------
public static Action<string> LogAction = DefaultLogger;
// NOTEs are only logged if the domain is enabled.
@@ -57,7 +57,7 @@ namespace BizHawk.Common
LogAction(string.Format(msg, vals));
}
- // ============== Default Logger Action ==============
+ // -------------- Default Logger Action --------------
public static Stream? HACK_LOG_STREAM;
private static readonly bool LogToConsole = false;
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/MemoryMap.CodeMasters.cs b/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/MemoryMap.CodeMasters.cs
index 6920104509..d6d69bc521 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/MemoryMap.CodeMasters.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/MemoryMap.CodeMasters.cs
@@ -2,14 +2,14 @@
{
public partial class SMS
{
- // =======================================================================
+ // -----------------------------------------------------------------------
// The CodeMasters mapper has 3 banks of 16kb, like the Sega mapper.
// The differences are that the paging control addresses are different, and the first 1K of ROM is not protected.
// Bank 0: Control Address $0000 - Maps $0000 - $3FFF
// Bank 1: Control Address $4000 - Maps $4000 - $7FFF
// Bank 2: Control Address $8000 - Maps $8000 - $BFFF
// System RAM is at $C000+ as in the Sega mapper.
- // =======================================================================
+ // -----------------------------------------------------------------------
private byte ReadMemoryCM(ushort address)
{
@@ -48,9 +48,9 @@
WriteMemoryCM(0x8000, 0);
}
- // =======================================================================
+ // -----------------------------------------------------------------------
// CodeMasters with on-board volatile RAM
- // =======================================================================
+ // -----------------------------------------------------------------------
private byte ReadMemoryCMRam(ushort address)
{
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/MemoryMap.Korea.cs b/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/MemoryMap.Korea.cs
index efd95ba275..af43747593 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/MemoryMap.Korea.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/MemoryMap.Korea.cs
@@ -64,9 +64,9 @@
Bios_bank = 2;
}
- // ======================================================================
+ // ----------------------------------------------------------------------
// MSX mapper & Nemesis mapper
- // ======================================================================
+ // ----------------------------------------------------------------------
private byte ReadMemoryMSX(ushort address)
{