Update brightmap reading

- Does it per-wad
- Saves hashes for certain bits
- Adds R_UpdateTextureBrightmap to respect the zone memory

src/d_netcmd.c

@@ -2571,7 +2571,7 @@ static void Command_Map_f(void)
 
 	mustmodifygame = !(netgame || multiplayer) && !majormods;
 
-	if (mustmodifygame)
+	if (mustmodifygame && !option_force)
 	{
 		/* May want to be more descriptive? */
 		CONS_Printf(M_GetText("Sorry, level change disabled in single player.\n"));

src/k_brightmap.c

@@ -37,7 +37,7 @@ static size_t maxBrightmapStorage = 0;
 static brightmapStorage_t *K_NewBrightmap(void)
 {
 	maxBrightmapStorage++;
-	brightmapStorage = (brightmapStorage_t *)Z_Realloc(brightmapStorage, sizeof(brightmapStorage_t) * (maxBrightmapStorage + 1), PU_STATIC, NULL);
+	brightmapStorage = (brightmapStorage_t *)Z_Realloc(brightmapStorage, sizeof(brightmapStorage_t) * (maxBrightmapStorage + 1), PU_STATIC, &brightmapStorage);
 	return &brightmapStorage[ maxBrightmapStorage - 1 ];
 }
 
@@ -63,6 +63,7 @@ static brightmapStorage_t *K_GetBrightmapStorageByIndex(size_t checkIndex)
 --------------------------------------------------*/
 static brightmapStorage_t *K_GetBrightmapStorageByTextureName(const char *checkName)
 {
+	UINT32 checkHash = quickncasehash(checkName, 8);
 	size_t i;
 
 	if (maxBrightmapStorage == 0)
@@ -74,7 +75,7 @@ static brightmapStorage_t *K_GetBrightmapStorageByTextureName(const char *checkN
 	{
 		brightmapStorage_t *bms = &brightmapStorage[i];
 
-		if (stricmp(checkName, bms->textureName) == 0)
+		if (checkHash == bms->textureHash)
 		{
 			// Name matches.
 			return bms;
@@ -119,6 +120,7 @@ static boolean K_BRIGHTLumpParser(UINT8 *data, size_t size)
 				{
 					bms = K_NewBrightmap();
 					strncpy(bms->textureName, tkn, 9);
+					bms->textureHash = quickncasehash(bms->textureName, 8);
 				}
 
 				Z_Free(tkn);
@@ -128,6 +130,7 @@ static boolean K_BRIGHTLumpParser(UINT8 *data, size_t size)
 				if (tkn && pos < size)
 				{
 					strncpy(bms->brightmapName, tkn, 9);
+					bms->brightmapHash = quickncasehash(bms->brightmapName, 8);
 				}
 				else
 				{
@@ -163,37 +166,25 @@ static boolean K_BRIGHTLumpParser(UINT8 *data, size_t size)
 }
 
 /*--------------------------------------------------
-	void K_InitBrightmaps(void)
+	void K_InitBrightmapsPwad(INT32 wadNum)
 
 		See header file for description.
 --------------------------------------------------*/
-void K_InitBrightmaps(void)
+void K_InitBrightmapsPwad(INT32 wadNum)
 {
-	INT32 wadNum;
+	UINT16 lumpNum;
 	size_t i;
 
 	I_Assert(brightmapStorage == NULL);
-	maxBrightmapStorage = 0;
-
-	for (wadNum = 0; wadNum < numwadfiles; wadNum++)
-	{
-		UINT16 lumpNum;
 
 	// Find BRIGHT lump in the WAD
 	lumpNum = W_CheckNumForNamePwad("BRIGHT", wadNum, 0);
 
 	while (lumpNum != INT16_MAX)
 	{
-			UINT8 *data;
+		UINT8 *data = (UINT8 *)W_CacheLumpNumPwad(wadNum, lumpNum, PU_CACHE);
-			data = (UINT8 *)W_CacheLumpNumPwad(wadNum, lumpNum, PU_STATIC);
 
-			// If that didn't exist, we have nothing to do here.
+		if (data != NULL)
-			if (data == NULL)
-			{
-				lumpNum = W_CheckNumForNamePwad("BRIGHT", (UINT16)wadNum, lumpNum + 1);
-				continue;
-			}
-			else
 		{
 			lumpinfo_t *lump_p = &wadfiles[wadNum]->lumpinfo[lumpNum];
 			size_t size = W_LumpLengthPwad(wadNum, lumpNum);
@@ -210,11 +201,11 @@ void K_InitBrightmaps(void)
 			K_BRIGHTLumpParser(data, size);
 
 			free(name);
+			Z_Free(data);
 		}
 
 		lumpNum = W_CheckNumForNamePwad("BRIGHT", (UINT16)wadNum, lumpNum + 1);
 	}
-	}
 
 	if (maxBrightmapStorage == 0)
 	{
@@ -237,14 +228,7 @@ void K_InitBrightmaps(void)
 		if (texNum != -1)
 		{
 			bmNum = R_CheckTextureNumForName(bms->brightmapName);
-			if (bmNum == -1)
+			R_UpdateTextureBrightmap(texNum, (bmNum == -1 ? 0 : bmNum));
-			{
-				texturebrightmaps[texNum] = 0;
-			}
-			else
-			{
-				texturebrightmaps[texNum] = bmNum;
-			}
 		}
 	}
 
@@ -253,4 +237,20 @@ void K_InitBrightmaps(void)
 	// Clear brightmapStorage now that we're done with it.
 	Z_Free(brightmapStorage);
 	brightmapStorage = NULL;
+	maxBrightmapStorage = 0;
+}
+
+/*--------------------------------------------------
+	void K_InitBrightmaps(void)
+
+		See header file for description.
+--------------------------------------------------*/
+void K_InitBrightmaps(void)
+{
+	INT32 wadNum;
+
+	for (wadNum = 0; wadNum < numwadfiles; wadNum++)
+	{
+		K_InitBrightmapsPwad(wadNum);
+	}
 }

src/k_brightmap.h

@@ -24,9 +24,20 @@ typedef struct brightmapStorage_s
 	// before putting them into texturebrightmaps.
 
 	char textureName[9]; // The texture's name.
+	UINT32 textureHash; // The texture name's hash.
+
 	char brightmapName[9]; // The brightmap's name.
+	UINT32 brightmapHash; // The brightmap name's hash.
 } brightmapStorage_t;
 
+/*--------------------------------------------------
+	void K_InitBrightmapsPwad(INT32 wadNum);
+
+		Finds all BRIGHT lumps for one WAD/PK3 and processes them.
+--------------------------------------------------*/
+
+void K_InitBrightmapsPwad(INT32 wadNum);
+
 /*--------------------------------------------------
 	void K_InitBrightmaps(void);
 

src/p_setup.c

@@ -4463,7 +4463,7 @@ boolean P_AddWadFile(const char *wadfilename)
 	P_InitPicAnims();
 
 	// Reload BRIGHT
-	K_InitBrightmaps();
+	K_InitBrightmapsPwad(wadnum);
 
 	// Flush and reload HUD graphics
 	//ST_UnloadGraphics();

src/r_textures.h

@@ -96,6 +96,8 @@ void *R_GetFlat(lumpnum_t flatnum);
 boolean R_CheckPowersOfTwo(void);
 void R_CheckFlatLength(size_t size);
 
+void R_UpdateTextureBrightmap(INT32 tx, INT32 bm);
+
 // Returns the texture number for the texture name.
 INT32 R_TextureNumForName(const char *name);
 INT32 R_CheckTextureNumForName(const char *name);