Replace sequences of 7 or more = chars in C# source with -
just makes it easier to grep for Git merge conflicts
This commit is contained in:
parent
2077b19caa
commit
56594840ad
|
@ -75,7 +75,7 @@ namespace BizHawk.Client.Common.Filters
|
||||||
var shader = shaders[i] = new RetroShader(Owner, content, debug);
|
var shader = shaders[i] = new RetroShader(Owner, content, debug);
|
||||||
if (!shader.Available)
|
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;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,7 +19,7 @@ namespace BizHawk.Common
|
||||||
//EnableDomain("MEM");
|
//EnableDomain("MEM");
|
||||||
}
|
}
|
||||||
|
|
||||||
// ============== Logging Domain Configuration ==============
|
// -------------- Logging Domain Configuration --------------
|
||||||
private static readonly List<string> EnabledLogDomains = new List<string>();
|
private static readonly List<string> EnabledLogDomains = new List<string>();
|
||||||
|
|
||||||
public static void EnableDomain(string domain)
|
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;
|
public static Action<string> LogAction = DefaultLogger;
|
||||||
|
|
||||||
// NOTEs are only logged if the domain is enabled.
|
// NOTEs are only logged if the domain is enabled.
|
||||||
|
@ -57,7 +57,7 @@ namespace BizHawk.Common
|
||||||
LogAction(string.Format(msg, vals));
|
LogAction(string.Format(msg, vals));
|
||||||
}
|
}
|
||||||
|
|
||||||
// ============== Default Logger Action ==============
|
// -------------- Default Logger Action --------------
|
||||||
public static Stream? HACK_LOG_STREAM;
|
public static Stream? HACK_LOG_STREAM;
|
||||||
|
|
||||||
private static readonly bool LogToConsole = false;
|
private static readonly bool LogToConsole = false;
|
||||||
|
|
|
@ -2,14 +2,14 @@
|
||||||
{
|
{
|
||||||
public partial class SMS
|
public partial class SMS
|
||||||
{
|
{
|
||||||
// =======================================================================
|
// -----------------------------------------------------------------------
|
||||||
// The CodeMasters mapper has 3 banks of 16kb, like the Sega mapper.
|
// 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.
|
// 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 0: Control Address $0000 - Maps $0000 - $3FFF
|
||||||
// Bank 1: Control Address $4000 - Maps $4000 - $7FFF
|
// Bank 1: Control Address $4000 - Maps $4000 - $7FFF
|
||||||
// Bank 2: Control Address $8000 - Maps $8000 - $BFFF
|
// Bank 2: Control Address $8000 - Maps $8000 - $BFFF
|
||||||
// System RAM is at $C000+ as in the Sega mapper.
|
// System RAM is at $C000+ as in the Sega mapper.
|
||||||
// =======================================================================
|
// -----------------------------------------------------------------------
|
||||||
|
|
||||||
private byte ReadMemoryCM(ushort address)
|
private byte ReadMemoryCM(ushort address)
|
||||||
{
|
{
|
||||||
|
@ -48,9 +48,9 @@
|
||||||
WriteMemoryCM(0x8000, 0);
|
WriteMemoryCM(0x8000, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
// =======================================================================
|
// -----------------------------------------------------------------------
|
||||||
// CodeMasters with on-board volatile RAM
|
// CodeMasters with on-board volatile RAM
|
||||||
// =======================================================================
|
// -----------------------------------------------------------------------
|
||||||
|
|
||||||
private byte ReadMemoryCMRam(ushort address)
|
private byte ReadMemoryCMRam(ushort address)
|
||||||
{
|
{
|
||||||
|
|
|
@ -64,9 +64,9 @@
|
||||||
Bios_bank = 2;
|
Bios_bank = 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ======================================================================
|
// ----------------------------------------------------------------------
|
||||||
// MSX mapper & Nemesis mapper
|
// MSX mapper & Nemesis mapper
|
||||||
// ======================================================================
|
// ----------------------------------------------------------------------
|
||||||
|
|
||||||
private byte ReadMemoryMSX(ushort address)
|
private byte ReadMemoryMSX(ushort address)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue