From a3cfa8dd5c22d9e3ca3a7ec7f71ebc4436129079 Mon Sep 17 00:00:00 2001
From: wolfy852 <wolfy852@hotmail.com>
Date: Sat, 7 Oct 2017 14:52:27 -0500
Subject: [PATCH] Fixes from toaster, plus some other stuff

---
 src/w_wad.c | 10 +++++-----
 src/w_wad.h | 10 ++++++++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/w_wad.c b/src/w_wad.c
index cf7034958..3c0c2eb4f 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -553,7 +553,7 @@ UINT16 W_InitFile(const char *filename)
 				switch(eCompression)
 				{
 				case 0:
-					lump_p->compression = CM_NONE;
+					lump_p->compression = CM_NOCOMPRESSION;
 					break;
 				case 8:
 					lump_p->compression = CM_DEFLATE;
@@ -584,7 +584,7 @@ UINT16 W_InitFile(const char *filename)
 				lumpinfo[numlumps].position = 0;
 				lumpinfo[numlumps].size = 0;
 				lumpinfo[numlumps].disksize = 0;
-				lumpinfo[numlumps].compression = CM_NONE;
+				lumpinfo[numlumps].compression = CM_NOCOMPRESSION;
 				numlumps++;*/
 				break;
 			}
@@ -670,7 +670,7 @@ UINT16 W_InitFile(const char *filename)
 				else
 				{
 					lump_p->size -= 4;
-					lump_p->compression = CM_NONE;
+					lump_p->compression = CM_NOCOMPRESSION;
 				}
 
 				lump_p->position += 4;
@@ -678,7 +678,7 @@ UINT16 W_InitFile(const char *filename)
 			}
 			else
 			{
-				lump_p->compression = CM_NONE;
+				lump_p->compression = CM_NOCOMPRESSION;
 			}
 			memset(lump_p->name, 0x00, 9);
 			strncpy(lump_p->name, fileinfo->name, 8);
@@ -1092,7 +1092,7 @@ size_t W_ReadLumpHeaderPwad(UINT16 wad, UINT16 lump, void *dest, size_t size, si
 	// But let's not copy it yet. We support different compression formats on lumps, so we need to take that into account.
 	switch(wadfiles[wad]->lumpinfo[lump].compression)
 	{
-	case CM_NONE:		// If it's uncompressed, we directly write the data into our destination, and return the bytes read.
+	case CM_NOCOMPRESSION:		// If it's uncompressed, we directly write the data into our destination, and return the bytes read.
 		return fread(dest, 1, size, handle);
 	case CM_LZF:		// Is it LZF compressed? Used by ZWADs.
 		{
diff --git a/src/w_wad.h b/src/w_wad.h
index 1c81f2587..429c12c41 100644
--- a/src/w_wad.h
+++ b/src/w_wad.h
@@ -43,7 +43,13 @@ typedef struct
 } ATTRPACK filelump_t;
 
 // Available compression methods for lumps.
-enum compmethod{CM_NONE, CM_DEFLATE, CM_LZF, CM_UNSUPPORTED};
+typedef enum 
+{
+	CM_NOCOMPRESSION, 
+	CM_DEFLATE, 
+	CM_LZF, 
+	CM_UNSUPPORTED
+} compmethod;
 
 //  a memory entry of the wad directory
 typedef struct
@@ -54,7 +60,7 @@ typedef struct
 	char *name2; // Used by PK3s. Dynamically allocated name.
 	size_t size; // real (uncompressed) size
 	INT32 compressed; // i
-	enum compmethod compression; // lump compression method
+	compmethod compression; // lump compression method
 } lumpinfo_t;
 
 // =========================================================================