sloppy 0.3 release for network dll loads and separation of trainer

3 files changed, 15 insertions, 3 deletions

diff --git a/StardewModdingAPI/Inheritance/SGame.cs b/StardewModdingAPI/Inheritance/SGame.cs
index b28b8d7c..0202e55f 100644
--- a/StardewModdingAPI/Inheritance/SGame.cs
+++ b/StardewModdingAPI/Inheritance/SGame.cs
@@ -117,7 +117,9 @@ namespace StardewModdingAPI.Inheritance
         {
             base.Draw(gameTime);
             Events.InvokeDrawTick();
-            spriteBatch.Begin(SpriteSortMode.Immediate, BlendState.Opaque, SamplerState.PointClamp, DepthStencilState.DepthRead, RasterizerState.CullNone);
+            /*
+            spriteBatch.Begin(SpriteSortMode.BackToFront, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);
+
             if (CurrentLocation != null)
                 CurrentLocation.draw(Game1.spriteBatch);
 
@@ -125,6 +127,7 @@ namespace StardewModdingAPI.Inheritance
                 spriteBatch.DrawString(Game1.dialogueFont, Game1.player.position.ToString(), new Vector2(0, 180), Color.Orange);
             
             spriteBatch.End();
+            */
         }
 
         public static Int32 RegisterModItem(SObject modItem)
diff --git a/StardewModdingAPI/Inheritance/SGameLocation.cs b/StardewModdingAPI/Inheritance/SGameLocation.cs
index 82caab40..69b44003 100644
--- a/StardewModdingAPI/Inheritance/SGameLocation.cs
+++ b/StardewModdingAPI/Inheritance/SGameLocation.cs
@@ -29,6 +29,11 @@ namespace StardewModdingAPI.Inheritance
             //s.Map = baseClass.Map;
             //s.objects = baseClass.objects;
             //s.temporarySprites = baseClass.temporarySprites;
+            s.map = baseClass.map;
+            s.objects = baseClass.objects;
+            s.name = baseClass.name;
+
+            /*
             s.actionObjectForQuestionDialogue = baseClass.actionObjectForQuestionDialogue;
             s.characters = baseClass.characters;
             s.critters = (List<Critter>)typeof(GameLocation).GetField("critters", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(baseClass);
@@ -67,6 +72,7 @@ namespace StardewModdingAPI.Inheritance
             s.waterColor = baseClass.waterColor;
             s.waterTileFlip = baseClass.waterTileFlip;
             s.waterTiles = baseClass.waterTiles;
+            */
             return s;
         }
 
diff --git a/StardewModdingAPI/Inheritance/SObject.cs b/StardewModdingAPI/Inheritance/SObject.cs
index 79edcb34..97d2fa41 100644
--- a/StardewModdingAPI/Inheritance/SObject.cs
+++ b/StardewModdingAPI/Inheritance/SObject.cs
@@ -55,11 +55,12 @@ namespace StardewModdingAPI.Inheritance
 
         public override void draw(SpriteBatch spriteBatch, int xNonTile, int yNonTile, float layerDepth, float alpha = 1)
         {
+            return;
             try
             {
                 if (Texture != null)
                 {
-                    int targSize = 64;
+                    int targSize = Game1.tileSize;
                     int midX = (int) ((xNonTile) + 32);
                     int midY = (int) ((yNonTile) + 32);
 
@@ -68,12 +69,14 @@ namespace StardewModdingAPI.Inheritance
 
                     Rectangle targ = new Rectangle(targX, targY, targSize, targSize);
                     spriteBatch.Draw(Texture, targ, null, new Color(255, 255, 255, 255f * alpha), 0, Vector2.Zero, SpriteEffects.None, layerDepth);
-                    spriteBatch.Draw(Program.DebugPixel, targ, null, Color.Red, 0, Vector2.Zero, SpriteEffects.None, layerDepth);
+                    //spriteBatch.Draw(Program.DebugPixel, targ, null, Color.Red, 0, Vector2.Zero, SpriteEffects.None, layerDepth);
+                    /*
                     spriteBatch.DrawString(Game1.dialogueFont, "TARG: " + targ, new Vector2(128, 0), Color.Red);
                     spriteBatch.DrawString(Game1.dialogueFont, ".", new Vector2(targX * 0.5f, targY), Color.Orange);
                     spriteBatch.DrawString(Game1.dialogueFont, ".", new Vector2(targX, targY), Color.Red);
                     spriteBatch.DrawString(Game1.dialogueFont, ".", new Vector2(targX * 1.5f, targY), Color.Yellow);
                     spriteBatch.DrawString(Game1.dialogueFont, ".", new Vector2(targX * 2f, targY), Color.Green);
+                    */
                 }
             }
             catch (Exception ex)