diff options
| author | Jesse Plamondon-Willard <github@jplamondonw.com> | 2017-02-07 20:51:22 -0500 |
|---|---|---|
| committer | Jesse Plamondon-Willard <github@jplamondonw.com> | 2017-02-07 20:51:22 -0500 |
| commit | cec74697866da2d67a62c3a4ef10d605592e4152 (patch) | |
| tree | f61628808e6df44615cec8be479ab7f5e99f7d2b /src/StardewModdingAPI/Framework | |
| parent | 95a93a05b39d2b27b538ecdb0e6a18f28096c5c2 (diff) | |
| download | SMAPI-cec74697866da2d67a62c3a4ef10d605592e4152.tar.gz SMAPI-cec74697866da2d67a62c3a4ef10d605592e4152.tar.bz2 SMAPI-cec74697866da2d67a62c3a4ef10d605592e4152.zip | |
disambiguate references to Farmer (#231)
Diffstat (limited to 'src/StardewModdingAPI/Framework')
| -rw-r--r-- | src/StardewModdingAPI/Framework/SGame.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/StardewModdingAPI/Framework/SGame.cs b/src/StardewModdingAPI/Framework/SGame.cs index 2486e376..2aaca9af 100644 --- a/src/StardewModdingAPI/Framework/SGame.cs +++ b/src/StardewModdingAPI/Framework/SGame.cs @@ -14,6 +14,7 @@ using StardewValley.Menus; using StardewValley.Tools; using xTile.Dimensions; using Rectangle = Microsoft.Xna.Framework.Rectangle; +using SFarmer = StardewValley.Farmer; namespace StardewModdingAPI.Framework { @@ -131,7 +132,7 @@ namespace StardewModdingAPI.Framework public bool PreviousIsNewDay { get; private set; } /// <summary>The player character at last check.</summary> - public Farmer PreviousFarmer { get; private set; } + public SFarmer PreviousFarmer { get; private set; } /// <summary>An index incremented on every tick and reset every 60th tick (0–59).</summary> public int CurrentUpdateTick { get; private set; } @@ -164,7 +165,7 @@ namespace StardewModdingAPI.Framework /// <summary>The current player.</summary> [Obsolete("Use Game1.player instead")] - public Farmer CurrentFarmer => Game1.player; + public SFarmer CurrentFarmer => Game1.player; /// <summary>The game method which draws the farm buildings.</summary> public static MethodInfo DrawFarmBuildings = typeof(Game1).GetMethod("drawFarmBuildings", BindingFlags.NonPublic | BindingFlags.Instance); @@ -296,7 +297,6 @@ namespace StardewModdingAPI.Framework /// <summary>The method called during game launch after configuring XNA or MonoGame. The game window hasn't been opened by this point.</summary> protected override void Initialize() { - //ModItems = new Dictionary<int, SObject>(); SGame.DebugMessageQueue = new Queue<string>(); this.PreviouslyPressedButtons = new Buttons[4][]; for (var i = 0; i < 4; ++i) |