From fabac78ea877be05c26e3f5de880b3725c5ba83b Mon Sep 17 00:00:00 2001
From: Magnus Norddahl <dpjudas@users.noreply.github.com>
Date: Mon, 21 Nov 2016 15:19:24 +0100
Subject: [PATCH] Add poly renderer to the menus

---
 src/r_main.cpp             | 8 ++++----
 src/r_swrenderer.cpp       | 8 ++++----
 wadsrc/static/language.enu | 1 +
 wadsrc/static/menudef.txt  | 1 +
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/r_main.cpp b/src/r_main.cpp
index 1ba89eecd..e0773718f 100644
--- a/src/r_main.cpp
+++ b/src/r_main.cpp
@@ -63,7 +63,7 @@
 #include "p_setup.h"
 #include "version.h"
 
-CUSTOM_CVAR(Bool, r_newrenderer, 0, CVAR_NOINITCALL)
+CUSTOM_CVAR(Bool, r_polyrenderer, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
 {
 	if (self == 1 && !hasglnodes)
 	{
@@ -915,7 +915,7 @@ void R_RenderActorView (AActor *actor, bool dontmaplines)
 	// Link the polyobjects right before drawing the scene to reduce the amounts of calls to this function
 	PO_LinkToSubsectors();
 	InSubsector = NULL;
-	if (!r_newrenderer)
+	if (!r_polyrenderer)
 	{
 		R_RenderBSPNode(nodes + numnodes - 1);	// The head node is the last node output.
 	}
@@ -932,7 +932,7 @@ void R_RenderActorView (AActor *actor, bool dontmaplines)
 	if (viewactive)
 	{
 		PlaneCycles.Clock();
-		if (!r_newrenderer)
+		if (!r_polyrenderer)
 		{
 			R_DrawPlanes();
 			R_DrawPortals();
@@ -953,7 +953,7 @@ void R_RenderActorView (AActor *actor, bool dontmaplines)
 		NetUpdate ();
 		
 		MaskedCycles.Clock();
-		if (!r_newrenderer)
+		if (!r_polyrenderer)
 			R_DrawMasked ();
 		MaskedCycles.Unclock();
 
diff --git a/src/r_swrenderer.cpp b/src/r_swrenderer.cpp
index 3ddfcb5f2..708b465e1 100644
--- a/src/r_swrenderer.cpp
+++ b/src/r_swrenderer.cpp
@@ -47,7 +47,7 @@
 #include "r_poly.h"
 
 EXTERN_CVAR(Bool, r_shadercolormaps)
-EXTERN_CVAR(Bool, r_newrenderer)	// [SP] dpJudas's new renderer
+EXTERN_CVAR(Bool, r_polyrenderer)	// [SP] dpJudas's new renderer
 EXTERN_CVAR(Float, maxviewpitch)	// [SP] CVAR from GZDoom
 
 void R_SWRSetWindow(int windowSize, int fullWidth, int fullHeight, int stHeight, float trueratio);
@@ -242,7 +242,7 @@ void FSoftwareRenderer::WriteSavePic (player_t *player, FileWriter *file, int wi
 
 void FSoftwareRenderer::DrawRemainingPlayerSprites()
 {
-	if (!r_newrenderer)
+	if (!r_polyrenderer)
 	{
 		R_DrawRemainingPlayerSprites();
 	}
@@ -262,12 +262,12 @@ void FSoftwareRenderer::DrawRemainingPlayerSprites()
 
 int FSoftwareRenderer::GetMaxViewPitch(bool down)
 {
-	return (r_newrenderer) ? int(maxviewpitch) : (down ? MAX_DN_ANGLE : MAX_UP_ANGLE);
+	return (r_polyrenderer) ? int(maxviewpitch) : (down ? MAX_DN_ANGLE : MAX_UP_ANGLE);
 }
 
 bool FSoftwareRenderer::RequireGLNodes()
 {
-	return r_newrenderer;
+	return r_polyrenderer;
 }
 
 //==========================================================================
diff --git a/wadsrc/static/language.enu b/wadsrc/static/language.enu
index 881cde31f..177d63521 100644
--- a/wadsrc/static/language.enu
+++ b/wadsrc/static/language.enu
@@ -2152,6 +2152,7 @@ MODMNU_CHIPOMATIC		= "Chip-o-matic";
 RNDMNU_TITLE			= "CHANGE RENDERER";
 RNDMNU_RENDERER			= "Hardware Acceleration";
 RNDMNU_TRUECOLOR		= "Software Truecolor Mode";
+RNDMNU_POLY				= "Poly Renderer (experimental)";
 RNDMNU_CANVAS			= "Software Canvas";
 
 // Video Options
diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt
index 81c18a522..1c9d42de1 100644
--- a/wadsrc/static/menudef.txt
+++ b/wadsrc/static/menudef.txt
@@ -1773,6 +1773,7 @@ OptionMenu RendererMenu
 	Title "$RNDMNU_TITLE"
 	Option "$RNDMNU_RENDERER",	"vid_renderer", "PolyDoom"
 	Option "$RNDMNU_TRUECOLOR",	"swtruecolor", "OnOff"
+	Option "$RNDMNU_POLY",		"r_polyrenderer", "OnOff"
 	IfOption(Windows)
 	{
 		Option "$RNDMNU_CANVAS",	"vid_used3d", "D3DGL"