From b080ad995449ac3670069ffa4dc138265a24f51a Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Thu, 30 May 2024 07:31:03 +0300
Subject: [PATCH] engine: moved link_t helpers to sv_world.c from world.c and
 made them static

---
 engine/common/world.c    | 47 ----------------------------------------
 engine/common/world.h    |  7 ------
 engine/server/sv_world.c | 47 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 54 deletions(-)

diff --git a/engine/common/world.c b/engine/common/world.c
index 9ed7f082..37c0f533 100644
--- a/engine/common/world.c
+++ b/engine/common/world.c
@@ -20,53 +20,6 @@ GNU General Public License for more details.
 #include "xash3d_mathlib.h"
 #include "studio.h"
 
-/*
-===============================================================================
-
-	ENTITY LINKING
-
-===============================================================================
-*/
-/*
-===============
-ClearLink
-
-ClearLink is used for new headnodes
-===============
-*/
-void ClearLink( link_t *l )
-{
-	l->prev = l->next = l;
-}
-
-/*
-===============
-RemoveLink
-
-remove link from chain
-===============
-*/
-void RemoveLink( link_t *l )
-{
-	l->next->prev = l->prev;
-	l->prev->next = l->next;
-}
-
-/*
-===============
-InsertLinkBefore
-
-kept trigger and solid entities seperate
-===============
-*/
-void InsertLinkBefore( link_t *l, link_t *before )
-{
-	l->next = before;
-	l->prev = before->prev;
-	l->prev->next = l;
-	l->next->prev = l;
-}
-
 /*
 ==================
 World_MoveBounds
diff --git a/engine/common/world.h b/engine/common/world.h
index d3a10ce5..199ae9f3 100644
--- a/engine/common/world.h
+++ b/engine/common/world.h
@@ -35,13 +35,6 @@ ENTITY AREA CHECKING
 
 #include "lightstyle.h"
 
-extern const char		*et_name[];
-
-// linked list
-void InsertLinkBefore( link_t *l, link_t *before );
-void RemoveLink( link_t *l );
-void ClearLink( link_t *l );
-
 // trace common
 void World_MoveBounds( const vec3_t start, vec3_t mins, vec3_t maxs, const vec3_t end, vec3_t boxmins, vec3_t boxmaxs );
 void World_TransformAABB( matrix4x4 transform, const vec3_t mins, const vec3_t maxs, vec3_t outmins, vec3_t outmaxs );
diff --git a/engine/server/sv_world.c b/engine/server/sv_world.c
index 8cb9fa62..6e706962 100644
--- a/engine/server/sv_world.c
+++ b/engine/server/sv_world.c
@@ -358,6 +358,53 @@ static hull_t *SV_HullForStudioModel( edict_t *ent, vec3_t mins, vec3_t maxs, ve
 	return SV_HullForEntity( ent, mins, maxs, offset );
 }
 
+/*
+===============================================================================
+
+	ENTITY LINKING
+
+===============================================================================
+*/
+/*
+===============
+ClearLink
+
+ClearLink is used for new headnodes
+===============
+*/
+static void ClearLink( link_t *l )
+{
+	l->prev = l->next = l;
+}
+
+/*
+===============
+RemoveLink
+
+remove link from chain
+===============
+*/
+static void RemoveLink( link_t *l )
+{
+	l->next->prev = l->prev;
+	l->prev->next = l->next;
+}
+
+/*
+===============
+InsertLinkBefore
+
+kept trigger and solid entities seperate
+===============
+*/
+static void InsertLinkBefore( link_t *l, link_t *before )
+{
+	l->next = before;
+	l->prev = before->prev;
+	l->prev->next = l;
+	l->next->prev = l;
+}
+
 /*
 ===============================================================================