Remove TraceFirePortal using non-test shot

YaLTeR · Nov 29, 2022 · 1557512 · 1557512
1 parent 1927e3f
commit 1557512
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/spt/features/tracing.cpp b/spt/features/tracing.cpp
@@ -186,16 +186,8 @@ float Tracing::TraceTransformFirePortal(trace_t& tr,
 
 	const int PORTAL_PLACED_BY_PLAYER = 2;
 
-	return ORIG_TraceFirePortal(weapon,
-	                            0,
-	                            isPortal2,
-	                            transformedPos,
-	                            vDirection,
-	                            tr,
-	                            finalPos,
-	                            finalAngles,
-	                            PORTAL_PLACED_BY_PLAYER,
-	                            false);
+	return ORIG_TraceFirePortal(
+	    weapon, 0, isPortal2, transformedPos, vDirection, tr, finalPos, finalAngles, PORTAL_PLACED_BY_PLAYER, true);
 }
 
 #endif

diff --git a/spt/features/visualizations/portal_placement.cpp b/spt/features/visualizations/portal_placement.cpp
@@ -28,9 +28,9 @@ ConVar y_spt_hud_portal_placement("y_spt_hud_portal_placement",
                                   "0",
                                   FCVAR_CHEAT,
                                   "Show portal placement info\n"
-                                  "1 = Boolean result\n"
-                                  "2 = String result\n"
-                                  "3 = Float result");
+                                  "      1 = Boolean result\n"
+                                  "      2 = String result\n"
+                                  "      3 = Float result");
 ConVar y_spt_draw_pp("y_spt_draw_pp", "0", FCVAR_CHEAT, "Draw portal placement.");
 ConVar y_spt_draw_pp_blue("y_spt_draw_pp_blue", "1", FCVAR_CHEAT, "Draw blue portal placement.");
 ConVar y_spt_draw_pp_orange("y_spt_draw_pp_orange", "1", FCVAR_CHEAT, "Draw orange portal placement.");
@@ -173,6 +173,7 @@ static const wchar_t* PlacementResultToString(float placement)
 	if (placement == PORTAL_PLACEMENT_SUCCESS_OVERLAP_LINKED)
 		return L"Overlaps existing portal";
 	if (placement == PORTAL_PLACEMENT_SUCCESS_NEAR)
+		// Not possible for non-test shot
 		return L"Near existing portal";
 	if (placement == PORTAL_PLACEMENT_SUCCESS_INVALID_VOLUME)
 		return L"Invalid volume";