summaryrefslogtreecommitdiff
path: root/src/StardewModdingAPI.AssemblyRewriters/Rewriters
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <github@jplamondonw.com>2017-03-12 03:23:20 -0400
committerJesse Plamondon-Willard <github@jplamondonw.com>2017-03-12 03:23:20 -0400
commitfae362723f1390cb7758bd151d50889cf6c999a9 (patch)
tree8a98a9dba6cf8c07d85a45f92ad1577b2578cee8 /src/StardewModdingAPI.AssemblyRewriters/Rewriters
parent9fab0bf58f7c8b7d38f026bde4230e39049c056b (diff)
downloadSMAPI-fae362723f1390cb7758bd151d50889cf6c999a9.tar.gz
SMAPI-fae362723f1390cb7758bd151d50889cf6c999a9.tar.bz2
SMAPI-fae362723f1390cb7758bd151d50889cf6c999a9.zip
reject mods which reference obsolete Game1.borderFont and Game1.smoothFont fields (#247)
Diffstat (limited to 'src/StardewModdingAPI.AssemblyRewriters/Rewriters')
-rw-r--r--src/StardewModdingAPI.AssemblyRewriters/Rewriters/SDV1_2/Game1_ActiveClickableMenu_FieldRewriter.cs2
-rw-r--r--src/StardewModdingAPI.AssemblyRewriters/Rewriters/SDV1_2/Game1_GameMode_FieldRewriter.cs2
-rw-r--r--src/StardewModdingAPI.AssemblyRewriters/Rewriters/SDV1_2/Game1_Player_FieldRewriter.cs2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/StardewModdingAPI.AssemblyRewriters/Rewriters/SDV1_2/Game1_ActiveClickableMenu_FieldRewriter.cs b/src/StardewModdingAPI.AssemblyRewriters/Rewriters/SDV1_2/Game1_ActiveClickableMenu_FieldRewriter.cs
index bb49f16c..59a7c798 100644
--- a/src/StardewModdingAPI.AssemblyRewriters/Rewriters/SDV1_2/Game1_ActiveClickableMenu_FieldRewriter.cs
+++ b/src/StardewModdingAPI.AssemblyRewriters/Rewriters/SDV1_2/Game1_ActiveClickableMenu_FieldRewriter.cs
@@ -28,7 +28,7 @@ namespace StardewModdingAPI.AssemblyRewriters.Rewriters.SDV1_2
protected override bool IsMatch(Instruction instruction, FieldReference fieldRef, bool platformChanged)
{
return
- (instruction.OpCode == OpCodes.Ldsfld || instruction.OpCode == OpCodes.Stsfld) // static field
+ this.IsStaticField(instruction)
&& fieldRef.DeclaringType.FullName == typeof(Game1).FullName
&& fieldRef.Name == nameof(Game1.activeClickableMenu);
}
diff --git a/src/StardewModdingAPI.AssemblyRewriters/Rewriters/SDV1_2/Game1_GameMode_FieldRewriter.cs b/src/StardewModdingAPI.AssemblyRewriters/Rewriters/SDV1_2/Game1_GameMode_FieldRewriter.cs
index 4d84d9ac..c3da6863 100644
--- a/src/StardewModdingAPI.AssemblyRewriters/Rewriters/SDV1_2/Game1_GameMode_FieldRewriter.cs
+++ b/src/StardewModdingAPI.AssemblyRewriters/Rewriters/SDV1_2/Game1_GameMode_FieldRewriter.cs
@@ -28,7 +28,7 @@ namespace StardewModdingAPI.AssemblyRewriters.Rewriters.SDV1_2
protected override bool IsMatch(Instruction instruction, FieldReference fieldRef, bool platformChanged)
{
return
- (instruction.OpCode == OpCodes.Ldsfld || instruction.OpCode == OpCodes.Stsfld) // static field
+ this.IsStaticField(instruction)
&& fieldRef.DeclaringType.FullName == typeof(Game1).FullName
&& fieldRef.Name == nameof(Game1.gameMode);
}
diff --git a/src/StardewModdingAPI.AssemblyRewriters/Rewriters/SDV1_2/Game1_Player_FieldRewriter.cs b/src/StardewModdingAPI.AssemblyRewriters/Rewriters/SDV1_2/Game1_Player_FieldRewriter.cs
index f43f5d57..91eae416 100644
--- a/src/StardewModdingAPI.AssemblyRewriters/Rewriters/SDV1_2/Game1_Player_FieldRewriter.cs
+++ b/src/StardewModdingAPI.AssemblyRewriters/Rewriters/SDV1_2/Game1_Player_FieldRewriter.cs
@@ -28,7 +28,7 @@ namespace StardewModdingAPI.AssemblyRewriters.Rewriters.SDV1_2
protected override bool IsMatch(Instruction instruction, FieldReference fieldRef, bool platformChanged)
{
return
- (instruction.OpCode == OpCodes.Ldsfld || instruction.OpCode == OpCodes.Stsfld) // static field
+ this.IsStaticField(instruction)
&& fieldRef.DeclaringType.FullName == typeof(Game1).FullName
&& fieldRef.Name == nameof(Game1.player);
}