From 47758a519df557983722085ca099ba28d8ec5724 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 27 May 2017 07:51:11 -0500 Subject: [PATCH] delete more meteor stuff --- BizHawk.Client.Common/RomLoader.cs | 1 - .../Extensions/CoreExtensions.cs | 4 ---- .../Properties/Resources.Designer.cs | 10 ---------- BizHawk.Client.EmuHawk/Properties/Resources.resx | 3 --- BizHawk.Client.EmuHawk/images/meteor.png | Bin 820 -> 0 bytes 5 files changed, 18 deletions(-) delete mode 100644 BizHawk.Client.EmuHawk/images/meteor.png diff --git a/BizHawk.Client.Common/RomLoader.cs b/BizHawk.Client.Common/RomLoader.cs index c0d2e21ab1..d5bba8c7ac 100644 --- a/BizHawk.Client.Common/RomLoader.cs +++ b/BizHawk.Client.Common/RomLoader.cs @@ -842,7 +842,6 @@ namespace BizHawk.Client.Common nextEmulator = c64; break; case "GBA": - // core = CoreInventory.Instance["GBA", "Meteor"]; if (Global.Config.GBA_UsemGBA) { core = CoreInventory.Instance["GBA", "mGBA"]; diff --git a/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs b/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs index 822451cdd6..234ba3c611 100644 --- a/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs +++ b/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs @@ -44,10 +44,6 @@ namespace BizHawk.Client.EmuHawk.CoreExtensions { return Properties.Resources.emu7800; } - else if (core is GBA) - { - return Properties.Resources.meteor; - } else if (core is GPGX) { return Properties.Resources.genplus; diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs index a5d0f207dd..08544fa997 100644 --- a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs +++ b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs @@ -900,16 +900,6 @@ namespace BizHawk.Client.EmuHawk.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap meteor { - get { - object obj = ResourceManager.GetObject("meteor", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.resx b/BizHawk.Client.EmuHawk/Properties/Resources.resx index e4f374957f..54487806a0 100644 --- a/BizHawk.Client.EmuHawk/Properties/Resources.resx +++ b/BizHawk.Client.EmuHawk/Properties/Resources.resx @@ -1041,9 +1041,6 @@ ..\images\tastudio\ts_v_piano_04_green_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\images\meteor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\images\HotKeys.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/BizHawk.Client.EmuHawk/images/meteor.png b/BizHawk.Client.EmuHawk/images/meteor.png deleted file mode 100644 index 8ddc63696cb19703419b4c2d1b933944d3cb63c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 820 zcmV-41Izr0P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A0007`NklNS2dF$h2_k}_l%#FdmNwH(o7P&b*&n`^uB{jF z+4r{}5H=e8%4tG_$F#zbaw@KuN>SZ|u7Ueq{ouevd3B*=z)E^S-7Kmbu~yU$tgjdY z(x+khxL?eTt0oBfSfgBj)II#LdvIQ&i{kXGl3SWXDho(K23|KefQUh7<3qM-&^}Ff z2_P4rezaZed(7*(2ZoKNjFOjw0^5 zNuxT74(Ak{ZS7b^&8{dIr#UY`n)G%7!y#b!B?wjUVi2KtwjM1^BC>>hl*C7hYF=K& zP2vL?VgIL$3y7PS94PEW;d-tA*A~!`|2j_z@tfvhVtUUlZ+ck zSd31L>Bd=a^JKv~7ZkCALdJ($uH;?Yl(8$?@w00DFsLuez%3c=tl$GSR?JR}<-*`j zo;*m${6aV)X4Ty<_I!p-DJwY(|G7MEdlzeSoSF(gF9#`LaSPc#G3U6HXjdDg3?XMZ z2|1FGa@HkqTEV^j`MY6LZL8VM1@>h%0&FZ>s7YQC=P*a4h#f*X9>Adx4iX|LCIa^Z zhE~0^Wt?efk@D=w=bVQE%T$57^-VTv)x}cgMITBJptKN5i{iAaqvp$bXL)IcDimji z{(4ftQY_a!QGQ~^Wx~>_WH^!BcBf~?j_Tg y$NN{ut-J4EO