- add hitscan only autoaim for SW.

ZDoom · Jul 17, 2021 · f951dbf · f951dbf
1 parent 5f41578
commit f951dbf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/source/core/gamecvars.cpp b/source/core/gamecvars.cpp
@@ -86,7 +86,7 @@ CVARD(Bool, cl_hudinterpolation, true, CVAR_ARCHIVE, "enable/disable HUD (weapon
 
 CUSTOM_CVARD(Int, cl_autoaim, 1, CVAR_ARCHIVE|CVAR_USERINFO, "enable/disable weapon autoaim")
 {
-	int automodes = (g_gameType & (GAMEFLAG_DUKECOMPAT | GAMEFLAG_BLOOD)) ? 2 : 1;
+	int automodes = (g_gameType & (GAMEFLAG_DUKECOMPAT | GAMEFLAG_BLOOD | GAMEFLAG_SW)) ? 2 : 1;
 	if (self < 0 || self > automodes) self = 1;
 };
 

diff --git a/source/games/sw/src/weapon.cpp b/source/games/sw/src/weapon.cpp
@@ -14288,7 +14288,7 @@ WeaponAutoAim(SPRITEp sp, short Missile, short ang, bool test)
 
     if (u && u->PlayerP)
     {
-        if (!Autoaim(u->PlayerP->pnum))
+        if (Autoaim(u->PlayerP->pnum) != 2)
         {
             return -1;
         }

diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt
@@ -951,7 +951,7 @@ OptionValue "WeapSwitch"
 OptionMenu GameplayOptions protected
 {
 	Title 	"$GMPLYMNU_TITLE"
-	ifgame(Duke, Nam, WW2GI, Redneck, RedneckRides, Blood)
+	ifgame(Duke, Nam, WW2GI, Redneck, RedneckRides, Blood, ShadowWarrior)
 	{
 		Option "$PLYRMNU_AUTOAIM", "cl_autoaim", "AimMode"
 	}