From e7de9502bae38b9ae925f9a43142305eca9153d8 Mon Sep 17 00:00:00 2001
From: TehRealSalt <tehrealsalt@gmail.com>
Date: Mon, 23 Oct 2017 17:27:00 -0400
Subject: [PATCH] Balloon error fix, and papersprite fix

---
 src/p_mobj.c   | 12 ++++++------
 src/r_things.c |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/p_mobj.c b/src/p_mobj.c
index 71c462c3..279712f0 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -6631,7 +6631,7 @@ void P_MobjThinker(mobj_t *mobj)
 						if (mobj->target->flags2 & MF2_DONTDRAW)
 							mobj->flags2 |= MF2_DONTDRAW;
 						else
-							mobj->flags2 &= !MF2_DONTDRAW;
+							mobj->flags2 &= ~MF2_DONTDRAW;
 
 						if (mobj->target->eflags & MFE_VERTICALFLIP)
 							HEIGHT += 4*FRACUNIT;
@@ -9230,7 +9230,7 @@ void P_SpawnPlayer(INT32 playernum)
 		if (mobj->flags2 & MF2_DONTDRAW)
 			mo->flags2 |= MF2_DONTDRAW;
 		else
-			mo->flags2 &= !MF2_DONTDRAW;
+			mo->flags2 &= ~MF2_DONTDRAW;
 
 		if (p->kartstuff[k_balloon] & 2)
 		{
@@ -9242,7 +9242,7 @@ void P_SpawnPlayer(INT32 playernum)
 			if (mobj->flags2 & MF2_DONTDRAW)
 				mo2->flags2 |= MF2_DONTDRAW;
 			else
-				mo2->flags2 &= !MF2_DONTDRAW;
+				mo2->flags2 &= ~MF2_DONTDRAW;
 		}
 
 		if (p->kartstuff[k_balloon] & 4)
@@ -9255,7 +9255,7 @@ void P_SpawnPlayer(INT32 playernum)
 			if (mobj->flags2 & MF2_DONTDRAW)
 				mo3->flags2 |= MF2_DONTDRAW;
 			else
-				mo3->flags2 &= !MF2_DONTDRAW;
+				mo3->flags2 &= ~MF2_DONTDRAW;
 		}
 
 		if (p->kartstuff[k_balloon] & 8)
@@ -9268,7 +9268,7 @@ void P_SpawnPlayer(INT32 playernum)
 			if (mobj->flags2 & MF2_DONTDRAW)
 				mo4->flags2 |= MF2_DONTDRAW;
 			else
-				mo4->flags2 &= !MF2_DONTDRAW;
+				mo4->flags2 &= ~MF2_DONTDRAW;
 		}
 
 		if (p->kartstuff[k_balloon] & 16)
@@ -9281,7 +9281,7 @@ void P_SpawnPlayer(INT32 playernum)
 			if (mobj->flags2 & MF2_DONTDRAW)
 				mo5->flags2 |= MF2_DONTDRAW;
 			else
-				mo5->flags2 &= !MF2_DONTDRAW;
+				mo5->flags2 &= ~MF2_DONTDRAW;
 		}
 	}
 }
diff --git a/src/r_things.c b/src/r_things.c
index 1a8a69ce..3977949f 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -1249,7 +1249,7 @@ static void R_ProjectSprite(mobj_t *thing)
 
 	offset2 = FixedMul(spritecachedinfo[lump].width, this_scale);
 	tx += FixedMul(offset2, ang_scale);
-	x2 = ((centerxfrac + FixedMul (tx,xscale)) >>FRACBITS) - 1;
+	x2 = ((centerxfrac + FixedMul (tx,xscale)) >> FRACBITS) - (papersprite ? 2 : 1);
 
 	// off the left side
 	if (x2 < 0)