StardewValley
/
SMAPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed conflict

This commit is contained in:
Maurício Gomes 2016-03-31 20:18:18 -03:00
parent 8177e65a49
commit 7930d532d5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
StardewModdingAPI/Inheritance/SGame.cs
View File

@ -1313,9 +1313,6 @@ namespace StardewModdingAPI.Inheritance
GraphicsEvents.InvokeOnPostRenderEvent(null, EventArgs.Empty); GraphicsEvents.InvokeOnPostRenderEvent(null, EventArgs.Empty);
spriteBatch.End(); spriteBatch.End();
GraphicsEvents.InvokeDrawTick();
GraphicsEvents.InvokeDrawInRenderTargetTick();
if (!ZoomLevelIsOne) if (!ZoomLevelIsOne)
{ {
GraphicsDevice.SetRenderTarget(null); GraphicsDevice.SetRenderTarget(null);
@ -1324,6 +1321,9 @@ namespace StardewModdingAPI.Inheritance
spriteBatch.Draw(Screen, Vector2.Zero, Screen.Bounds, Color.White, 0f, Vector2.Zero, options.zoomLevel, SpriteEffects.None, 1f); spriteBatch.Draw(Screen, Vector2.Zero, Screen.Bounds, Color.White, 0f, Vector2.Zero, options.zoomLevel, SpriteEffects.None, 1f);
spriteBatch.End(); spriteBatch.End();
} }
GraphicsEvents.InvokeDrawTick();
GraphicsEvents.InvokeDrawInRenderTargetTick();
} }
catch (Exception ex) catch (Exception ex)
{ {