WIP

emawind84 · Mar 14, 2024 · d69cd2a · d69cd2a
1 parent b63cd60
commit d69cd2a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/playsim/p_mobj.cpp b/src/playsim/p_mobj.cpp
@@ -7114,6 +7114,7 @@ AActor *P_SpawnPlayerMissile (AActor *source, double x, double y, double z,
 	P_PlaySpawnSound(MissileActor, source, !!(aimflags & ALF_ISOFFHAND) ? CHAN_OFFWEAPON : CHAN_WEAPON, CHANF_OVERLAP);
 	MissileActor->target = source;
 	MissileActor->Angles.Yaw = an;
+	MissileActor->Angles.Pitch = pitch;
 	if (MissileActor->flags3 & (MF3_FLOORHUGGER | MF3_CEILINGHUGGER))
 	{
 		MissileActor->VelFromAngle();

diff --git a/wadsrc/static/zscript/actors/inventory/stateprovider.zs b/wadsrc/static/zscript/actors/inventory/stateprovider.zs
@@ -288,7 +288,7 @@ class StateProvider : Inventory
 						Vector3 dir;
 						if (weapon.bOffhandWeapon)
 						{
-							dir = player.mo.OffhandDir(misl, misl.Angle + angle, misl.Pitch);
+							dir = player.mo.OffhandDir(misl, misl.Angle + (weapon.bNoAutoReverse ? 1. : -1.) * angle, misl.Pitch);
 						}
 						else
 						{

diff --git a/wadsrc/static/zscript/actors/strife/weapongrenade.zs b/wadsrc/static/zscript/actors/strife/weapongrenade.zs
@@ -96,7 +96,7 @@ class StrifeGrenadeLauncher : StrifeWeapon
 				if (weapon.bOffhandWeapon)
 				{
 					dir = player.mo.OffhandDir(self, Angle, pitch);
-					offsetDir = player.mo.OffhandDir(self, Angle + angleofs, pitch);
+					offsetDir = player.mo.OffhandDir(self, Angle + (weapon.bNoAutoReverse ? 1. : -1.) * angleofs, pitch);
 					zoffsetDir = player.mo.OffhandDir(self, Angle, pitch + 90);
 				}
 				else
@@ -140,6 +140,7 @@ class StrifeGrenadeLauncher : StrifeWeapon
 
 				grenade.Vel = gvel;
 			}
+			console.printf("x=%f, y=%f, z=%f", grenade.Vel.X, grenade.Vel.Y, grenade.Vel.Z);
 		}
 	}
 }