From 0f43546ada315d3d7509d79b378af5f4d020e013 Mon Sep 17 00:00:00 2001
From: Latapostrophe <hyperclassic3@gmail.com>
Date: Mon, 22 Apr 2019 11:29:44 +0200
Subject: [PATCH] Add option to turn off the PLAY default md2

---
 src/hardware/hw_main.c | 2 +-
 src/hardware/hw_main.h | 1 +
 src/m_menu.c           | 3 ++-
 src/r_main.c           | 1 +
 src/v_video.c          | 1 +
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 4fcef218..47148a9d 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -5261,7 +5261,7 @@ static void HWR_DrawSprites(void)
 				if (spr->mobj && spr->mobj->skin && spr->mobj->sprite == SPR_PLAY)
 				{
 					// 8/1/19: Only don't display player models if no default SPR_PLAY is found.
-					if (!cv_grmd2.value || ((md2_playermodels[(skin_t*)spr->mobj->skin-skins].notfound || md2_playermodels[(skin_t*)spr->mobj->skin-skins].scale < 0.0f) && (md2_models[SPR_PLAY].notfound || md2_models[SPR_PLAY].scale < 0.0f)))
+					if (!cv_grmd2.value || ((md2_playermodels[(skin_t*)spr->mobj->skin-skins].notfound || md2_playermodels[(skin_t*)spr->mobj->skin-skins].scale < 0.0f) && ((!cv_grdefaultmd2.value) || md2_models[SPR_PLAY].notfound || md2_models[SPR_PLAY].scale < 0.0f)))
 						HWR_DrawSprite(spr);
 					else
 						HWR_DrawMD2(spr);
diff --git a/src/hardware/hw_main.h b/src/hardware/hw_main.h
index 6978856e..4d639faf 100644
--- a/src/hardware/hw_main.h
+++ b/src/hardware/hw_main.h
@@ -81,6 +81,7 @@ extern consvar_t cv_grcoronas;
 extern consvar_t cv_grcoronasize;
 #endif
 extern consvar_t cv_grmd2;
+extern consvar_t cv_grdefaultmd2;
 extern consvar_t cv_grfog;
 extern consvar_t cv_grfogcolor;
 extern consvar_t cv_grfogdensity;
diff --git a/src/m_menu.c b/src/m_menu.c
index 3ad076ff..ddee9874 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -1218,7 +1218,8 @@ static menuitem_t OP_VideoOptionsMenu[] =
 
 #ifdef HWRENDER
 	{IT_STRING | IT_CVAR,	NULL,	"3D models",            &cv_grmd2,              105},
-	{IT_SUBMENU|IT_STRING,	NULL,	"OpenGL Options...",	&OP_OpenGLOptionsDef,   115},
+	{IT_STRING | IT_CVAR,	NULL,	"Default 3D model",     &cv_grdefaultmd2,       115},
+	{IT_SUBMENU|IT_STRING,	NULL,	"OpenGL Options...",	&OP_OpenGLOptionsDef,   125},
 #endif
 };
 
diff --git a/src/r_main.c b/src/r_main.c
index 36182d0e..92c029b9 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -1571,6 +1571,7 @@ void R_RegisterEngineStuff(void)
 	CV_RegisterVar(&cv_grcoronasize);
 #endif
 	CV_RegisterVar(&cv_grmd2);
+	CV_RegisterVar(&cv_grdefaultmd2);
 #endif
 
 #ifdef HWRENDER
diff --git a/src/v_video.c b/src/v_video.c
index 473adeed..08ec8d3c 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -81,6 +81,7 @@ consvar_t cv_grcoronasize = {"gr_coronasize", "1", CV_SAVE| CV_FLOAT, 0, NULL, 0
 //static CV_PossibleValue_t CV_MD2[] = {{0, "Off"}, {1, "On"}, {2, "Old"}, {0, NULL}};
 // console variables in development
 consvar_t cv_grmd2 = {"gr_md2", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_grdefaultmd2 = {"gr_defaultmd2", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 #endif
 
 const UINT8 gammatable[5][256] =