ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some warning cleanup

This commit is contained in:
adelikat 2013-02-24 20:17:12 +00:00
parent 0530547f34
commit 84bc032656
9 changed files with 380 additions and 384 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
BizHawk.Emulation/Consoles/Atari/2600/Mappers/m4A50.cs
View File

@ -32,20 +32,18 @@ namespace BizHawk.Emulation.Consoles.Atari._2600
class m4A50 : MapperBase
{
int myLastData = 0xFF;
int myLastAddress = 0xFFFF;
private int myLastData = 0xFF;
private int myLastAddress = 0xFFFF;
bool myIsRomHigh = true;
bool myBankChanged = true;
bool myIsRomLow = true;
bool myIsRomMiddle = true;
private bool myIsRomHigh = true;
private bool myIsRomLow = true;
private bool myIsRomMiddle = true;
int mySliceHigh = 0;
int mySliceLow = 0;
int mySliceMiddle = 0;
ByteBuffer myRAM = new ByteBuffer(32768);
private int mySliceHigh = 0;
private int mySliceLow = 0;
private int mySliceMiddle = 0;
private ByteBuffer myRAM = new ByteBuffer(32768);
public override byte ReadMemory(ushort addr)
{
@ -103,7 +101,6 @@ namespace BizHawk.Emulation.Consoles.Atari._2600
if (!myIsRomLow)
{
myRAM[(addr & 0x7ff) + mySliceLow] = value;
myBankChanged = true;
}
}
else if (((addr & 0x1fff) >= 0x1800) && // 1.5K region at 0x1800 - 0x1dff
@ -112,7 +109,6 @@ namespace BizHawk.Emulation.Consoles.Atari._2600
if (!myIsRomMiddle)
{
myRAM[(addr & 0x7ff) + mySliceMiddle] = value;
myBankChanged = true;
}
}
else if ((addr & 0x1f00) == 0x1e00) // 256B region at 0x1e00 - 0x1eff
@ -120,7 +116,6 @@ namespace BizHawk.Emulation.Consoles.Atari._2600
if (!myIsRomHigh)
{
myRAM[(addr & 0xff) + mySliceHigh] = value;
myBankChanged = true;
}
}
else if ((addr & 0x1f00) == 0x1f00) // 256B region at 0x1f00 - 0x1fff
@ -130,7 +125,6 @@ namespace BizHawk.Emulation.Consoles.Atari._2600
{
mySliceHigh = (mySliceHigh & 0xf0ff) | ((addr & 0x8) << 8) |
((addr & 0x70) << 4);
myBankChanged = true;
}
}
}
@ -147,57 +141,47 @@ namespace BizHawk.Emulation.Consoles.Atari._2600
{
myIsRomHigh = true;
mySliceHigh = (address & 0xff) << 8;
myBankChanged = true;
}
else if ((address & 0x0f00) == 0x0d00) // Enable 256B of RAM at 0x1e00 - 0x1eff
{
myIsRomHigh = false;
mySliceHigh = (address & 0x7f) << 8;
myBankChanged = true;
}
else if ((address & 0x0f40) == 0x0e00) // Enable 2K of ROM at 0x1000 - 0x17ff
{
myIsRomLow = true;
mySliceLow = (address & 0x1f) << 11;
myBankChanged = true;
}
else if ((address & 0x0f40) == 0x0e40) // Enable 2K of RAM at 0x1000 - 0x17ff
{
myIsRomLow = false;
mySliceLow = (address & 0xf) << 11;
myBankChanged = true;
}
else if ((address & 0x0f40) == 0x0f00) // Enable 1.5K of ROM at 0x1800 - 0x1dff
{
myIsRomMiddle = true;
mySliceMiddle = (address & 0x1f) << 11;
myBankChanged = true;
}
else if ((address & 0x0f50) == 0x0f40) // Enable 1.5K of RAM at 0x1800 - 0x1dff
{
myIsRomMiddle = false;
mySliceMiddle = (address & 0xf) << 11;
myBankChanged = true;
}
else if ((address & 0x0f00) == 0x0400) // Toggle bit A11 of lower block address
{
mySliceLow = mySliceLow ^ 0x800;
myBankChanged = true;
}
else if ((address & 0x0f00) == 0x0500) // Toggle bit A12 of lower block address
{
mySliceLow = mySliceLow ^ 0x1000;
myBankChanged = true;
}
else if ((address & 0x0f00) == 0x0800) // Toggle bit A11 of middle block address
{
mySliceMiddle = mySliceMiddle ^ 0x800;
myBankChanged = true;
}
else if ((address & 0x0f00) == 0x0900) // Toggle bit A12 of middle block address
{
mySliceMiddle = mySliceMiddle ^ 0x1000;
myBankChanged = true;
}
// Zero-page hotspots for upper page
@ -208,13 +192,11 @@ namespace BizHawk.Emulation.Consoles.Atari._2600
{
myIsRomHigh = true;
mySliceHigh = value << 8;
myBankChanged = true;
}
else if ((address & 0xf75) == 0x75) // Enable 256B of RAM at 0x1e00 - 0x1eff
{
myIsRomHigh = false;
mySliceHigh = (value & 0x7f) << 8;
myBankChanged = true;
}
// Zero-page hotspots for lower and middle blocks
@ -226,25 +208,21 @@ namespace BizHawk.Emulation.Consoles.Atari._2600
{
myIsRomLow = true;
mySliceLow = (value & 0xf) << 11;
myBankChanged = true;
}
else if ((value & 0xf0) == 0x40) // Enable 2K of RAM at 0x1000 - 0x17ff
{
myIsRomLow = false;
mySliceLow = (value & 0xf) << 11;
myBankChanged = true;
}
else if ((value & 0xf0) == 0x90) // Enable 1.5K of ROM at 0x1800 - 0x1dff
{
myIsRomMiddle = true;
mySliceMiddle = ((value & 0xf) | 0x10) << 11;
myBankChanged = true;
}
else if ((value & 0xf0) == 0xc0) // Enable 1.5K of RAM at 0x1800 - 0x1dff
{
myIsRomMiddle = false;
mySliceMiddle = (value & 0xf) << 11;
myBankChanged = true;
}
}
}

10
BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper231.cs
View File

@ -41,7 +41,6 @@ namespace BizHawk.Emulation.Consoles.Nintendo
+---------------+---------------+
*/
public int prg_reg;
public bool low;
public int prg_bank_mask_16k;
public override bool Configure(NES.EDetectionOrigin origin)
@ -82,18 +81,9 @@ namespace BizHawk.Emulation.Consoles.Nintendo
}
public override byte ReadPRG(int addr)
{
if (low)
{
int bank = prg_reg & 0x1E;
return ROM[(bank << 14) + addr];
}
else
{
int bank = prg_reg;
return ROM[(bank << 14) + addr - 0x4000];
}
}
}
}

2
BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs
View File

@ -6,6 +6,8 @@ using System.IO;
using System.Collections.Generic;
using BizHawk.Emulation.CPUs.M6502;
#pragma warning disable 162
namespace BizHawk.Emulation.Consoles.Nintendo
{
public partial class NES : IEmulator

2
BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesCore.cs
View File

@ -49,7 +49,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo.SNES
class RegistrationRecord
{
public object tag;
public int scanline;
public int scanline = 0;
public Action<int> callback;
}
}

28
BizHawk.MultiClient/MainForm.cs
View File

@ -2009,20 +2009,20 @@ namespace BizHawk.MultiClient
break;
case "GB":
case "GBC":
if (false) // this code will load up a dual game boy
{
// this is horrible. we MUST decide when we should be using Game.System and when we should be using Emulator.SystemID
game.System = "DGB"; // HACK
//if (false) // this code will load up a dual game boy
//{
// // this is horrible. we MUST decide when we should be using Game.System and when we should be using Emulator.SystemID
// game.System = "DGB"; // HACK
if (Global.Config.GB_ForceDMG) game.AddOption("ForceDMG");
if (Global.Config.GB_GBACGB) game.AddOption("GBACGB");
if (Global.Config.GB_MulticartCompat) game.AddOption("MulitcartCompat");
GambatteLink gbl = new GambatteLink(nextComm, game, rom.FileData, game, rom.FileData);
nextEmulator = gbl;
// other stuff todo
}
else
{
// if (Global.Config.GB_ForceDMG) game.AddOption("ForceDMG");
// if (Global.Config.GB_GBACGB) game.AddOption("GBACGB");
// if (Global.Config.GB_MulticartCompat) game.AddOption("MulitcartCompat");
// GambatteLink gbl = new GambatteLink(nextComm, game, rom.FileData, game, rom.FileData);
// nextEmulator = gbl;
// // other stuff todo
//}
//else
//{
if (!Global.Config.GB_AsSGB)
{
if (Global.Config.GB_ForceDMG) game.AddOption("ForceDMG");
@ -2084,7 +2084,7 @@ namespace BizHawk.MultiClient
snes.Load(game, rom.FileData, sgbrom, deterministicemulation);
}
}
}
//}
break;
case "Coleco":
string colbiosPath = PathManager.StandardFirmwareName(Global.Config.FilenameCOLBios);

4
BizHawk.MultiClient/Program.cs
View File

@ -9,13 +9,15 @@ using SlimDX.DirectSound;
using Microsoft.VisualBasic.ApplicationServices;
#endif
#pragma warning disable 618
namespace BizHawk.MultiClient
{
static class Program
{
static Program()
{
http://www.codeproject.com/Articles/310675/AppDomain-AssemblyResolve-Event-Tips
//http://www.codeproject.com/Articles/310675/AppDomain-AssemblyResolve-Event-Tips
#if WINDOWS
// this will look in subdirectory "dll" to load pinvoked stuff
SetDllDirectory(System.IO.Path.Combine(PathManager.GetExeDirectoryAbsolute(), "dll"));

8
BizHawk.MultiClient/SNESTools/SNESGraphicsDebugger.cs
View File

@ -320,7 +320,7 @@ namespace BizHawk.MultiClient
eDisplayType CurrDisplaySelection { get { return (comboDisplayType.SelectedValue as eDisplayType?).Value; } }
//todo - something smarter to cycle through bitmaps without repeatedly trashing them (use the dispose callback on the viewer)
void RenderView()
private void RenderView()
{
Bitmap bmp = null;
System.Drawing.Imaging.BitmapData bmpdata = null;
@ -412,7 +412,7 @@ namespace BizHawk.MultiClient
map = new SNESGraphicsDecoder.TileEntry[0];
viewBgMode = bg.BGMode;
bool handled = false;
//bool handled = false;
if (bg.Enabled)
{
//TODO - directColor in normal BG renderer
@ -425,7 +425,7 @@ namespace BizHawk.MultiClient
bool mode7extbg = (bgnum == 2 && si.SETINI_Mode7ExtBG);
if (mode7 || mode7extbg)
{
handled = true;
//handled = true;
allocate(1024, 1024);
gd.DecodeMode7BG(pixelptr, stride / 4, mode7extbg);
numPixels = 128 * 128 * 8 * 8;
@ -438,7 +438,7 @@ namespace BizHawk.MultiClient
}
else
{
handled = true;
//handled = true;
var dims = bg.ScreenSizeInPixels;
dims.Height = dims.Width = Math.Max(dims.Width, dims.Height);
allocate(dims.Width, dims.Height);

1
BizHawk.MultiClient/tools/LuaWriter.Designer.cs generated
View File

@ -143,6 +143,7 @@
this.editToolStripMenuItem.Name = "editToolStripMenuItem";
this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
this.editToolStripMenuItem.Text = "Edit";
this.editToolStripMenuItem.DropDownOpened += new System.EventHandler(this.editToolStripMenuItem_DropDownOpened);
//
// undoToolStripMenuItem
//

23
BizHawk.MultiClient/tools/LuaWriter.cs
View File

@ -33,6 +33,7 @@ namespace BizHawk.MultiClient
public string CurrentFile = "";
bool changes = false;
bool redo = false;
bool hasChanged = false;
bool ProcessingText;
public Regex keyWords = new Regex("and|break|do|else|if|end|false|for|function|in|local|nil|not|or|repeat|return|then|true|until|while|elseif");
@ -932,6 +933,7 @@ namespace BizHawk.MultiClient
private void undoToolStripMenuItem_Click(object sender, EventArgs e)
{
LuaText.Undo();
redo = true;
}
private void redoToolStripMenuItem_Click(object sender, EventArgs e)
@ -952,5 +954,26 @@ namespace BizHawk.MultiClient
LuaText.BackColor = col.Color;
}
}
private void editToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
{
if (changes)
{
undoToolStripMenuItem.Enabled = true;
}
else
{
undoToolStripMenuItem.Enabled = false;
}
if (redo)
{
redoToolStripMenuItem.Enabled = true;
}
else
{
redoToolStripMenuItem.Enabled = false;
}
}
}
}