From 2a71c7fce26d3f1d71742b39ed67702b68508063 Mon Sep 17 00:00:00 2001
From: ChillerDragon <ChillerDragon@gmail.com>
Date: Tue, 10 Sep 2024 09:36:37 +0800
Subject: [PATCH] Share fng and vanilla tiles with the server

While implementing a ddnet based fng mod I realized that I reimplemented
the same enum that already exists on the client side.

So this encourages fng mod developers to use the indecies that the ddnet
client already knows.
---
 CMakeLists.txt                   |  2 ++
 src/game/editor/editor.h         | 44 --------------------------------
 src/game/editor/explanations.cpp |  3 +++
 src/game/mapitems_fng.h          | 33 ++++++++++++++++++++++++
 src/game/mapitems_vanilla.h      | 19 ++++++++++++++
 5 files changed, 57 insertions(+), 44 deletions(-)
 create mode 100644 src/game/mapitems_fng.h
 create mode 100644 src/game/mapitems_vanilla.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d1ebde9c..ea47e606f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2162,6 +2162,8 @@ set_src(GAME_SHARED GLOB src/game
   mapitems_ex.cpp
   mapitems_ex.h
   mapitems_ex_types.h
+  mapitems_fng.h
+  mapitems_vanilla.h
   prng.cpp
   prng.h
   teamscore.cpp
diff --git a/src/game/editor/editor.h b/src/game/editor/editor.h
index 6206cea25..c0ae45373 100644
--- a/src/game/editor/editor.h
+++ b/src/game/editor/editor.h
@@ -1044,50 +1044,6 @@ public:
 		TILE_PUB_ENTITIES_OFF2,
 	};
 
-	enum
-	{
-		TILE_FNG_SPIKE_GOLD = 7,
-		TILE_FNG_SPIKE_NORMAL,
-		TILE_FNG_SPIKE_RED,
-		TILE_FNG_SPIKE_BLUE,
-		TILE_FNG_SCORE_RED,
-		TILE_FNG_SCORE_BLUE,
-
-		TILE_FNG_SPIKE_GREEN = 14,
-		TILE_FNG_SPIKE_PURPLE,
-
-		TILE_FNG_SPAWN = 192,
-		TILE_FNG_SPAWN_RED,
-		TILE_FNG_SPAWN_BLUE,
-		TILE_FNG_FLAG_RED,
-		TILE_FNG_FLAG_BLUE,
-		TILE_FNG_SHIELD,
-		TILE_FNG_HEART,
-		TILE_FNG_SHOTGUN,
-		TILE_FNG_GRENADE,
-		TILE_FNG_NINJA,
-		TILE_FNG_LASER,
-
-		TILE_FNG_SPIKE_OLD1 = 208,
-		TILE_FNG_SPIKE_OLD2,
-		TILE_FNG_SPIKE_OLD3
-	};
-
-	enum
-	{
-		TILE_VANILLA_SPAWN = 192,
-		TILE_VANILLA_SPAWN_RED,
-		TILE_VANILLA_SPAWN_BLUE,
-		TILE_VANILLA_FLAG_RED,
-		TILE_VANILLA_FLAG_BLUE,
-		TILE_VANILLA_SHIELD,
-		TILE_VANILLA_HEART,
-		TILE_VANILLA_SHOTGUN,
-		TILE_VANILLA_GRENADE,
-		TILE_VANILLA_NINJA,
-		TILE_VANILLA_LASER,
-	};
-
 	// Explanations
 	enum class EExplanation
 	{
diff --git a/src/game/editor/explanations.cpp b/src/game/editor/explanations.cpp
index ad52b5d26..55b1c0917 100644
--- a/src/game/editor/explanations.cpp
+++ b/src/game/editor/explanations.cpp
@@ -1,3 +1,6 @@
+#include <game/mapitems_fng.h>
+#include <game/mapitems_vanilla.h>
+
 #include "editor.h"
 
 // DDNet entity explanations by Lady Saavik
diff --git a/src/game/mapitems_fng.h b/src/game/mapitems_fng.h
new file mode 100644
index 000000000..99c17f5a1
--- /dev/null
+++ b/src/game/mapitems_fng.h
@@ -0,0 +1,33 @@
+#ifndef GAME_MAPITEMS_FNG_H
+#define GAME_MAPITEMS_FNG_H
+
+enum
+{
+	TILE_FNG_SPIKE_GOLD = 7,
+	TILE_FNG_SPIKE_NORMAL,
+	TILE_FNG_SPIKE_RED,
+	TILE_FNG_SPIKE_BLUE,
+	TILE_FNG_SCORE_RED,
+	TILE_FNG_SCORE_BLUE,
+
+	TILE_FNG_SPIKE_GREEN = 14,
+	TILE_FNG_SPIKE_PURPLE,
+
+	TILE_FNG_SPAWN = 192,
+	TILE_FNG_SPAWN_RED,
+	TILE_FNG_SPAWN_BLUE,
+	TILE_FNG_FLAG_RED,
+	TILE_FNG_FLAG_BLUE,
+	TILE_FNG_SHIELD,
+	TILE_FNG_HEART,
+	TILE_FNG_SHOTGUN,
+	TILE_FNG_GRENADE,
+	TILE_FNG_NINJA,
+	TILE_FNG_LASER,
+
+	TILE_FNG_SPIKE_OLD1 = 208,
+	TILE_FNG_SPIKE_OLD2,
+	TILE_FNG_SPIKE_OLD3
+};
+
+#endif
diff --git a/src/game/mapitems_vanilla.h b/src/game/mapitems_vanilla.h
new file mode 100644
index 000000000..105640b7d
--- /dev/null
+++ b/src/game/mapitems_vanilla.h
@@ -0,0 +1,19 @@
+#ifndef GAME_MAPITEMS_VANILLA_H
+#define GAME_MAPITEMS_VANILLA_H
+
+enum
+{
+	TILE_VANILLA_SPAWN = 192,
+	TILE_VANILLA_SPAWN_RED,
+	TILE_VANILLA_SPAWN_BLUE,
+	TILE_VANILLA_FLAG_RED,
+	TILE_VANILLA_FLAG_BLUE,
+	TILE_VANILLA_SHIELD,
+	TILE_VANILLA_HEART,
+	TILE_VANILLA_SHOTGUN,
+	TILE_VANILLA_GRENADE,
+	TILE_VANILLA_NINJA,
+	TILE_VANILLA_LASER,
+};
+
+#endif