Changed All games: CCmd "conbg" now supports the paramaters "off" and…

… (alias) "none" - remove the current background.
skyjake · Jan 18, 2009 · 3c30aa5 · 3c30aa5
1 parent 7549616
commit 3c30aa5
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 22 deletions.
diff --git a/doomsday/plugins/jdoom/src/d_console.c b/doomsday/plugins/jdoom/src/d_console.c
@@ -78,11 +78,11 @@ DEFCC(CCmdConBackground);
 
 // PUBLIC DATA DEFINITIONS -------------------------------------------------
 
-materialnum_t consoleBG = 0;
-float   consoleZoom = 1;
+material_t* consoleBG = 0;
+float consoleZoom = 1;
 
 // Console variables.
-cvar_t  gameCVars[] = {
+cvar_t gameCVars[] = {
 // Console
     {"con-zoom", 0, CVT_FLOAT, &consoleZoom, 0.1f, 100.0f},
 
@@ -359,10 +359,17 @@ DEFCC(CCmdDoomFont)
  */
 DEFCC(CCmdConBackground)
 {
-    materialnum_t       num;
+    material_t*         mat;
 
-    if((num = R_MaterialCheckNumForName(argv[1], MG_FLATS)) != 0)
-        consoleBG = num;
+    if(!stricmp(argv[1], "off") || !stricmp(argv[1], "none"))
+    {
+        consoleBG = NULL;
+        return true;
+    }
+
+    if((mat = P_ToPtr(DMU_MATERIAL,
+            P_MaterialCheckNumForName(argv[1], MG_ANY))))
+        consoleBG = mat;
 
     return true;
 }
diff --git a/doomsday/plugins/jdoom64/src/d_console.c b/doomsday/plugins/jdoom64/src/d_console.c
@@ -81,11 +81,11 @@ DEFCC(CCmdConBackground);
 
 // PUBLIC DATA DEFINITIONS -------------------------------------------------
 
-materialnum_t consoleBG = 0;
-float   consoleZoom = 1;
+material_t* consoleBG = NULL;
+float consoleZoom = 1;
 
 // Console variables.
-cvar_t  gameCVars[] = {
+cvar_t gameCVars[] = {
 // Console
     {"con-zoom", 0, CVT_FLOAT, &consoleZoom, 0.1f, 100.0f},
 
@@ -366,10 +366,17 @@ DEFCC(CCmdDoom64Font)
  */
 DEFCC(CCmdConBackground)
 {
-    materialnum_t       num;
+    material_t*         mat;
 
-    if((num = R_MaterialCheckNumForName(argv[1], MG_FLATS)) != 0)
-        consoleBG = num;
+    if(!stricmp(argv[1], "off") || !stricmp(argv[1], "none"))
+    {
+        consoleBG = NULL;
+        return true;
+    }
+
+    if((mat = P_ToPtr(DMU_MATERIAL,
+            P_MaterialCheckNumForName(argv[1], MG_ANY))))
+        consoleBG = mat;
 
     return true;
 }
diff --git a/doomsday/plugins/jheretic/src/h_console.c b/doomsday/plugins/jheretic/src/h_console.c
@@ -80,7 +80,7 @@ DEFCC(CCmdConBackground);
 
 // PUBLIC DATA DEFINITIONS -------------------------------------------------
 
-materialnum_t consoleBG = 0;
+material_t* consoleBG = NULL;
 float consoleZoom = 1;
 
 // Console variables.
@@ -352,10 +352,17 @@ DEFCC(CCmdHereticFont)
  */
 DEFCC(CCmdConBackground)
 {
-    materialnum_t       num;
+    material_t*         mat;
 
-    if((num = R_MaterialCheckNumForName(argv[1], MG_FLATS)) != 0)
-        consoleBG = num;
+    if(!stricmp(argv[1], "off") || !stricmp(argv[1], "none"))
+    {
+        consoleBG = NULL;
+        return true;
+    }
+
+    if((mat = P_ToPtr(DMU_MATERIAL,
+            P_MaterialCheckNumForName(argv[1], MG_ANY))))
+        consoleBG = mat;
 
     return true;
 }
diff --git a/doomsday/plugins/jhexen/src/hconsole.c b/doomsday/plugins/jhexen/src/hconsole.c
@@ -86,11 +86,11 @@ DEFCC(CCmdConBackground);
 
 // PUBLIC DATA DEFINITIONS -------------------------------------------------
 
-materialnum_t consoleBG = 0;
-float   consoleZoom = 1;
+material_t* consoleBG = NULL;
+float consoleZoom = 1;
 
 // Console variables.
-cvar_t  gameCVars[] = {
+cvar_t gameCVars[] = {
 // Console
     {"con-zoom", 0, CVT_FLOAT, &consoleZoom, 0.1f, 100.0f},
 
@@ -339,10 +339,17 @@ DEFCC(CCmdHexenFont)
  */
 DEFCC(CCmdConBackground)
 {
-    materialnum_t       num;
+    material_t*         mat;
 
-    if((num = R_MaterialCheckNumForName(argv[1], MG_FLATS)) != 0)
-        consoleBG = num;
+    if(!stricmp(argv[1], "off") || !stricmp(argv[1], "none"))
+    {
+        consoleBG = NULL;
+        return true;
+    }
+
+    if((mat = P_ToPtr(DMU_MATERIAL,
+            P_MaterialCheckNumForName(argv[1], MG_ANY))))
+        consoleBG = mat;
 
     return true;
 }