- reverted WEAPONTOP to its original value of 32 and made the added fudging bit part of the render side.

This is needed so that 'offset(0,32)' does what it is supposed to do.

src/g_shared/a_weapons.cpp

@@ -640,6 +640,7 @@ void AWeapon::PostMorphWeapon ()
 
 	pspr = Owner->player->GetPSprite(PSP_WEAPON);
 	pspr->y = WEAPONBOTTOM;
+	pspr->ResetInterpolation();
 	pspr->SetState(GetUpState());
 }
 

src/p_pspr.cpp

@@ -262,8 +262,7 @@ void DPSprite::NewTick()
 			while (pspr)
 			{
 				pspr->processPending = true;
-				pspr->oldx = pspr->x;
+				pspr->ResetInterpolation();
-				pspr->oldy = pspr->y;
 
 				pspr = pspr->Next;
 			}

src/p_pspr.h

@@ -29,11 +29,8 @@
 
 #define WEAPONBOTTOM			128.
 
-// [RH] +0x6000 helps it meet the screen bottom
+#define WEAPONTOP				32.
-//		at higher resolutions while still being in
+#define WEAPON_FUDGE_Y			0.375
-//		the right spot at 320x200.
-#define WEAPONTOP				(32+6./16)
-
 class AInventory;
 
 //
@@ -77,6 +74,7 @@ public:
 	DPSprite*	GetNext()	      { return Next; }
 	AActor*		GetCaller()	      { return Caller; }
 	void		SetCaller(AActor *newcaller) { Caller = newcaller; }
+	void		ResetInterpolation() { oldx = x; oldy = y; }
 
 	double x, y;
 	double oldx, oldy;

src/r_things.cpp

@@ -1302,7 +1302,7 @@ void R_DrawPSprite(DPSprite *pspr, AActor *owner, float bobx, float boby, double
 	}
 
 	sx = pspr->oldx + (pspr->x - pspr->oldx) * ticfrac;
-	sy = pspr->oldy + (pspr->y - pspr->oldy) * ticfrac;
+	sy = pspr->oldy + (pspr->y - pspr->oldy) * ticfrac + WEAPON_FUDGE_Y;
 
 	if (pspr->Flags & PSPF_ADDBOB)
 	{
@@ -1610,7 +1610,7 @@ void R_DrawPlayerSprites ()
 			else
 			{
 				wx = weapon->oldx + (weapon->x - weapon->oldx) * r_TicFracF;
-				wy = weapon->oldy + (weapon->y - weapon->oldy) * r_TicFracF;
+				wy = weapon->oldy + (weapon->y - weapon->oldy) * r_TicFracF + WEAPON_FUDGE_Y;
 			}
 		}
 		else