From c343f87928dd654c085019978edea1b5699dc5b1 Mon Sep 17 00:00:00 2001
From: Denis Pauk <pauk.denis@gmail.com>
Date: Sat, 30 Mar 2024 18:29:36 +0200
Subject: [PATCH] maps: remove currently unused fields

---
 README.md                  | 10 +++++-----
 src/common/cmodels.c       |  8 ++++----
 src/common/collision.c     |  1 -
 src/common/header/files.h  |  2 +-
 src/common/header/shared.h |  1 -
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index d7d30365..f04cfd5d 100644
--- a/README.md
+++ b/README.md
@@ -87,14 +87,13 @@ Goals (finished):
   * support Anachronox .dat format,
   * add debug progress loading code for maps.
 
-
 Goals (none of it finished):
-
   * Single player support,
-  * support surface flags for Daikatana, Heretic 2, Anachronox,
-  * modified ReRelease game code support with removed KEX only related code.
+  * Support effects and additional flags for ReRelease when possible.
 
 Bonus goals:
+  * Port SiN/Daikatana pack support from pakextract,
+  * support surface flags and content types for Daikatana, Heretic 2, Anachronox,
   * Use shared model cache in client code insted reimplemnet in each render,
   * Check load soft colormap as 24bit color,
   * Use separete texture hi-color buffer for ui in soft render,
@@ -102,7 +101,8 @@ Bonus goals:
   * Cleanup function declarations in game save code,
   * Use 3 bytes vertex normal,
   * Support scalled textures for models and walls in soft render and fix
-    lighting with remastered maps.
+    lighting with remastered maps,
+  * modified ReRelease game code support with removed KEX only related code.
 
 Not a goal:
   * multiplayer protocol support with KEX engine,
diff --git a/src/common/cmodels.c b/src/common/cmodels.c
index 49666f25..7f4530bc 100644
--- a/src/common/cmodels.c
+++ b/src/common/cmodels.c
@@ -215,15 +215,15 @@ Mod_LoadValidateLumps(const char *name, const dheader_t *header)
 		{
 			if (header->lumps[s].filelen % rules[s])
 			{
-				Com_Printf("%s: lump #%d: incorrect size %d / %zd\n",
-					__func__, s, header->lumps[s].filelen, rules[s]);
+				Com_Printf("%s: Map %s lump #%d: incorrect size %d / %zd\n",
+					__func__, name, s, header->lumps[s].filelen, rules[s]);
 				error = true;
 			}
 #ifdef DEBUG
 			else
 			{
-				Com_Printf("%s: lump #%d: correct size %d / %zd\n",
-					__func__, s, header->lumps[s].filelen, rules[s]);
+				Com_Printf("%s: Map %s lump #%d: correct size %d / %zd\n",
+					__func__, name, s, header->lumps[s].filelen, rules[s]);
 			}
 #endif
 		}
diff --git a/src/common/collision.c b/src/common/collision.c
index dd271caf..279c7dc6 100644
--- a/src/common/collision.c
+++ b/src/common/collision.c
@@ -1370,7 +1370,6 @@ CMod_LoadSurfaces(const char *name, mapsurface_t **map_surfaces, int *numtexinfo
 		Q_strlcpy(out->c.name, in->texture, sizeof(out->c.name));
 		Q_strlcpy(out->rname, in->texture, sizeof(out->rname));
 		out->c.flags = LittleLong(in->flags);
-		out->c.value = LittleLong(in->value);
 	}
 }
 
diff --git a/src/common/header/files.h b/src/common/header/files.h
index 549dfdc5..3744c861 100644
--- a/src/common/header/files.h
+++ b/src/common/header/files.h
@@ -762,7 +762,7 @@ typedef struct texinfo_s
 {
 	float vecs[2][4]; /* [s/t][xyz offset] */
 	int flags;        /* miptex flags + overrides light emission, etc */
-	int value;
+	int value;        /* used with some flags, unused in Quake2 */
 	char texture[32]; /* texture name (textures*.wal) */
 	int nexttexinfo;  /* for animations, -1 = end of chain */
 } texinfo_t;
diff --git a/src/common/header/shared.h b/src/common/header/shared.h
index 8cfa9b10..3c2e7aa2 100644
--- a/src/common/header/shared.h
+++ b/src/common/header/shared.h
@@ -561,7 +561,6 @@ typedef struct csurface_s
 {
 	char name[16];
 	int flags; /* SURF_* */
-	int value; /* unused */
 } csurface_t;
 
 typedef struct mapsurface_s  /* used internally due to name len probs */