From efa2adbbb8854f82a572449fd6624cd73ce1734e Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Mon, 10 Aug 2020 15:03:09 -0400
Subject: [PATCH] Merge r_skins.c

---
 src/r_skins.c | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/src/r_skins.c b/src/r_skins.c
index 1161456d4..29d372a0a 100644
--- a/src/r_skins.c
+++ b/src/r_skins.c
@@ -454,36 +454,11 @@ static boolean R_ProcessPatchableFields(skin_t *skin, char *stoken, char *value)
 	FULLPROCESS(followitem)
 #undef FULLPROCESS
 
-<<<<<<< HEAD
-#define GETSKINCOLOR(field) else if (!stricmp(stoken, #field)) skin->field = R_GetColorByName(value);
-=======
-#define GETFRACBITS(field) else if (!stricmp(stoken, #field)) skin->field = atoi(value)<<FRACBITS;
-	GETFRACBITS(normalspeed)
-	GETFRACBITS(runspeed)
-
-	GETFRACBITS(mindash)
-	GETFRACBITS(maxdash)
-	GETFRACBITS(actionspd)
-
-	GETFRACBITS(radius)
-	GETFRACBITS(height)
-	GETFRACBITS(spinheight)
-#undef GETFRACBITS
-
-#define GETINT(field) else if (!stricmp(stoken, #field)) skin->field = atoi(value);
-	GETINT(thrustfactor)
-	GETINT(accelstart)
-	GETINT(acceleration)
-	GETINT(contspeed)
-	GETINT(contangle)
-#undef GETINT
-
 #define GETSKINCOLOR(field) else if (!stricmp(stoken, #field)) \
 { \
 	UINT16 color = R_GetColorByName(value); \
 	skin->field = (color ? color : SKINCOLOR_GREEN); \
 }
->>>>>>> srb2/next
 	GETSKINCOLOR(prefcolor)
 	GETSKINCOLOR(prefoppositecolor)
 #undef GETSKINCOLOR