From 39261941101e2794f3bc78c281e9ae8f3047e0df Mon Sep 17 00:00:00 2001
From: Johan Mattsson <39247600+mjunix@users.noreply.github.com>
Date: Sun, 13 Aug 2023 13:09:43 +0200
Subject: [PATCH 1/5] Remove redundant check

---
 radiant/eclass.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/radiant/eclass.cpp b/radiant/eclass.cpp
index c4e96e9f..0b3dbed4 100644
--- a/radiant/eclass.cpp
+++ b/radiant/eclass.cpp
@@ -449,10 +449,6 @@ eclass_t *Eclass_ForName( const char *name, qboolean has_brushes ){
 	}
 #endif
 
-	if ( !name ) {
-		return eclass_bad;
-	}
-
 	for ( e = eclass ; e ; e = e->next )
 		if ( !strcmp( name, e->name ) ) {
 			return e;

From 4bbf42e667127066484f0d71a8cb3b3f8d08f314 Mon Sep 17 00:00:00 2001
From: Johan Mattsson <39247600+mjunix@users.noreply.github.com>
Date: Sun, 13 Aug 2023 13:12:12 +0200
Subject: [PATCH 2/5] Remove repeated comparison

---
 tools/quake3/q3map2/shaders.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/quake3/q3map2/shaders.c b/tools/quake3/q3map2/shaders.c
index 160a5bb5..e868742d 100644
--- a/tools/quake3/q3map2/shaders.c
+++ b/tools/quake3/q3map2/shaders.c
@@ -1017,7 +1017,6 @@ static void ParseShaderFile( const char *filename ){
 							 !Q_stricmp( token, "clampMap" ) ||
 							 !Q_stricmp( token, "animMap" ) ||
 							 !Q_stricmp( token, "clampAnimMap" ) ||
-							 !Q_stricmp( token, "clampMap" ) ||
 							 !Q_stricmp( token, "mapComp" ) ||
 							 !Q_stricmp( token, "mapNoComp" ) ) {
 							/* skip one token for animated stages */

From 006317da48cd51b3d0d21b6a63f059ee82b942d3 Mon Sep 17 00:00:00 2001
From: Johan Mattsson <39247600+mjunix@users.noreply.github.com>
Date: Sun, 13 Aug 2023 13:13:20 +0200
Subject: [PATCH 3/5] Remove repeated comparison

---
 tools/urt/tools/quake3/q3map2/shaders.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/urt/tools/quake3/q3map2/shaders.c b/tools/urt/tools/quake3/q3map2/shaders.c
index 932c5d07..98aa9566 100644
--- a/tools/urt/tools/quake3/q3map2/shaders.c
+++ b/tools/urt/tools/quake3/q3map2/shaders.c
@@ -1015,7 +1015,6 @@ static void ParseShaderFile( const char *filename ){
 							 !Q_stricmp( token, "clampMap" ) ||
 							 !Q_stricmp( token, "animMap" ) ||
 							 !Q_stricmp( token, "clampAnimMap" ) ||
-							 !Q_stricmp( token, "clampMap" ) ||
 							 !Q_stricmp( token, "mapComp" ) ||
 							 !Q_stricmp( token, "mapNoComp" ) ) {
 							/* skip one token for animated stages */

From 966b8c33c7be8acb4302f620e9d5d946cbe3886e Mon Sep 17 00:00:00 2001
From: Johan Mattsson <39247600+mjunix@users.noreply.github.com>
Date: Sun, 13 Aug 2023 13:15:43 +0200
Subject: [PATCH 4/5] Fix incorrect comparison

---
 tools/quake3/q3map2/tjunction.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/quake3/q3map2/tjunction.c b/tools/quake3/q3map2/tjunction.c
index 317a0a36..b1752e18 100644
--- a/tools/quake3/q3map2/tjunction.c
+++ b/tools/quake3/q3map2/tjunction.c
@@ -616,7 +616,7 @@ int EdgeCompare( const void *elem1, const void *elem2 ) {
 	if ( d1 < d2 ) {
 		return -1;
 	}
-	if ( d2 > d1 ) {
+	if ( d2 < d1 ) {
 		return 1;
 	}
 	return 0;

From 25f4611a2473329b476fe33b6d2f99c381ff2e27 Mon Sep 17 00:00:00 2001
From: Johan Mattsson <39247600+mjunix@users.noreply.github.com>
Date: Sun, 13 Aug 2023 13:16:55 +0200
Subject: [PATCH 5/5] Fix incorrect comparison

---
 tools/urt/tools/quake3/q3map2/tjunction.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/urt/tools/quake3/q3map2/tjunction.c b/tools/urt/tools/quake3/q3map2/tjunction.c
index 1a493d3c..cda67480 100644
--- a/tools/urt/tools/quake3/q3map2/tjunction.c
+++ b/tools/urt/tools/quake3/q3map2/tjunction.c
@@ -616,7 +616,7 @@ int EdgeCompare( const void *elem1, const void *elem2 ) {
 	if ( d1 < d2 ) {
 		return -1;
 	}
-	if ( d2 > d1 ) {
+	if ( d2 < d1 ) {
 		return 1;
 	}
 	return 0;