diff options
| author | Maurício Gomes <mauricio.gomes@coderofworlds.com> | 2016-03-31 20:18:18 -0300 |
|---|---|---|
| committer | Maurício Gomes <mauricio.gomes@coderofworlds.com> | 2016-03-31 20:18:18 -0300 |
| commit | 7930d532d52a0158c5e315942c2cfce60cc4026c (patch) | |
| tree | 49a4eff6f880dc9cb7f80e15235f86033c7403a7 | |
| parent | 8177e65a49a4b6918ed33e617086aa633546b984 (diff) | |
| download | SMAPI-7930d532d52a0158c5e315942c2cfce60cc4026c.tar.gz SMAPI-7930d532d52a0158c5e315942c2cfce60cc4026c.tar.bz2 SMAPI-7930d532d52a0158c5e315942c2cfce60cc4026c.zip | |
fixed conflict
| -rw-r--r-- | StardewModdingAPI/Inheritance/SGame.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/StardewModdingAPI/Inheritance/SGame.cs b/StardewModdingAPI/Inheritance/SGame.cs index ccd3846c..5cdc92c6 100644 --- a/StardewModdingAPI/Inheritance/SGame.cs +++ b/StardewModdingAPI/Inheritance/SGame.cs @@ -1312,10 +1312,7 @@ namespace StardewModdingAPI.Inheritance GraphicsEvents.InvokeOnPostRenderEvent(null, EventArgs.Empty);
spriteBatch.End();
-
- GraphicsEvents.InvokeDrawTick();
- GraphicsEvents.InvokeDrawInRenderTargetTick();
-
+
if (!ZoomLevelIsOne)
{
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.End();
}
+
+ GraphicsEvents.InvokeDrawTick();
+ GraphicsEvents.InvokeDrawInRenderTargetTick();
}
catch (Exception ex)
{
|