From 2350405ad34ac0fb014cea9485d3a62b8aca9d3a Mon Sep 17 00:00:00 2001
From: Latapostrophe <hyperclassic3@gmail.com>
Date: Tue, 23 Apr 2019 23:49:46 +0200
Subject: [PATCH] Terminology changes

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

diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 47148a9d..3bb0627e 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) && ((!cv_grdefaultmd2.value) || 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_grfallbackplayermodel.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 4d639faf..720e82ee 100644
--- a/src/hardware/hw_main.h
+++ b/src/hardware/hw_main.h
@@ -81,7 +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_grfallbackplayermodel;
 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 ddee9874..10f8eae0 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -1218,7 +1218,7 @@ static menuitem_t OP_VideoOptionsMenu[] =
 
 #ifdef HWRENDER
 	{IT_STRING | IT_CVAR,	NULL,	"3D models",            &cv_grmd2,              105},
-	{IT_STRING | IT_CVAR,	NULL,	"Default 3D model",     &cv_grdefaultmd2,       115},
+	{IT_STRING | IT_CVAR,	NULL,	"Fallback Player 3D Model",	&cv_grfallbackplayermodel,	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 92c029b9..a3328084 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -1571,7 +1571,7 @@ void R_RegisterEngineStuff(void)
 	CV_RegisterVar(&cv_grcoronasize);
 #endif
 	CV_RegisterVar(&cv_grmd2);
-	CV_RegisterVar(&cv_grdefaultmd2);
+	CV_RegisterVar(&cv_grfallbackplayermodel);
 #endif
 
 #ifdef HWRENDER
diff --git a/src/v_video.c b/src/v_video.c
index 08ec8d3c..ae478394 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -81,7 +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};
+consvar_t cv_grfallbackplayermodel = {"gr_fallbackplayermodel", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 #endif
 
 const UINT8 gammatable[5][256] =