From 972e9cba09286e1e551f5a5913962be003119ba9 Mon Sep 17 00:00:00 2001
From: nashmuhandes <nashbackslash@gmail.com>
Date: Wed, 15 Jun 2022 23:53:23 +0800
Subject: [PATCH] Standardize and finalize the naming conventions for the new
 UDMF keys to everything lightmap-related to use an "lm_" prefix.

---
 src/maploader/udmf.cpp | 24 ++++++++++++------------
 src/namedef_custom.h   | 24 ++++++++++++------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/maploader/udmf.cpp b/src/maploader/udmf.cpp
index b65a2fcf26..ce32e11971 100644
--- a/src/maploader/udmf.cpp
+++ b/src/maploader/udmf.cpp
@@ -753,9 +753,9 @@ public:
 				th->friendlyseeblocks = CheckInt(key);
 				break;
 
-			case NAME_zdraysuncolor:
-			case NAME_zdraysampledistance:
-			case NAME_zdraygridsize:
+			case NAME_lm_suncolor:
+			case NAME_lm_sampledistance:
+			case NAME_lm_gridsize:
 				CHECK_N(Zd | Zdt)
 					break;
 
@@ -1129,9 +1129,9 @@ public:
 				ld->healthgroup = CheckInt(key);
 				break;
 
-			case NAME_lightcolorline:
-			case NAME_lightintensityline:
-			case NAME_lightdistanceline:
+			case NAME_lm_lightcolorline:
+			case NAME_lm_lightintensityline:
+			case NAME_lm_lightdistanceline:
 				CHECK_N(Zd | Zdt)
 				break;
 
@@ -1985,12 +1985,12 @@ public:
 					sec->health3dgroup = CheckInt(key);
 					break;
 
-				case NAME_lightcolorfloor:
-				case NAME_lightintensityfloor:
-				case NAME_lightdistancefloor:
-				case NAME_lightcolorceiling:
-				case NAME_lightintensityceiling:
-				case NAME_lightdistanceceiling:
+				case NAME_lm_lightcolorfloor:
+				case NAME_lm_lightintensityfloor:
+				case NAME_lm_lightdistancefloor:
+				case NAME_lm_lightcolorceiling:
+				case NAME_lm_lightintensityceiling:
+				case NAME_lm_lightdistanceceiling:
 					CHECK_N(Zd | Zdt)
 					break;
 
diff --git a/src/namedef_custom.h b/src/namedef_custom.h
index 8b19a2765b..deb213b70f 100644
--- a/src/namedef_custom.h
+++ b/src/namedef_custom.h
@@ -852,15 +852,15 @@ xx(Pagename)
 
 // Lightmap/ZDRay keywords
 // (Surface lights are temporarily disabled and don't do anything)
-xx(lightcolorline)
-xx(lightintensityline)
-xx(lightdistanceline)
-xx(lightcolorfloor)
-xx(lightintensityfloor)
-xx(lightdistancefloor)
-xx(lightcolorceiling)
-xx(lightintensityceiling)
-xx(lightdistanceceiling)
-xx(zdraysuncolor)
-xx(zdraysampledistance)
-xx(zdraygridsize)
+xx(lm_lightcolorline)
+xx(lm_lightintensityline)
+xx(lm_lightdistanceline)
+xx(lm_lightcolorfloor)
+xx(lm_lightintensityfloor)
+xx(lm_lightdistancefloor)
+xx(lm_lightcolorceiling)
+xx(lm_lightintensityceiling)
+xx(lm_lightdistanceceiling)
+xx(lm_suncolor)
+xx(lm_sampledistance)
+xx(lm_gridsize)