Merge 2a71c7fce2 into 0369946156

Don't add `/` if the directory is empty

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

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
 	{

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

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

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

src/game/server/gamecontext.cpp

@@ -3526,7 +3526,7 @@ void CGameContext::ConAddMapVotes(IConsole::IResult *pResult, void *pUserData)
 			str_format(aCommand, sizeof(aCommand), "clear_votes; add_map_votes \"%s\"", aDirectory);
 		}
 		else
-			str_format(aCommand, sizeof(aCommand), "change_map \"%s/%s\"", pDirectory, aOptionEscaped);
+			str_format(aCommand, sizeof(aCommand), "change_map \"%s%s%s\"", pDirectory, pDirectory[0] == '\0' ? "" : "/", aOptionEscaped);
 
 		pSelf->AddVote(aDescription, aCommand);
 	}

src/game/version.h

@@ -3,7 +3,7 @@
 #ifndef GAME_VERSION_H
 #define GAME_VERSION_H
 #ifndef GAME_RELEASE_VERSION
-#define GAME_RELEASE_VERSION "18.5"
+#define GAME_RELEASE_VERSION "18.5.1"
 #endif
 
 // teeworlds
@@ -13,7 +13,7 @@
 #define GAME_NETVERSION7 "0.7 802f1be60a05665f"
 
 // ddnet
-#define DDNET_VERSION_NUMBER 18050
+#define DDNET_VERSION_NUMBER 18051
 extern const char *GIT_SHORTREV_HASH;
 #define GAME_NAME "DDNet"
 #endif