Built-in formspecs: Force version 1

minetest · Sep 14, 2019 · 1de4ca1 · 1de4ca1
1 parent 8e42a25
commit 1de4ca1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/client/game.cpp b/src/client/game.cpp
@@ -3981,7 +3981,7 @@ void Game::extendedResourceCleanup()
 void Game::showDeathFormspec()
 {
 	static std::string formspec_str =
-		std::string(FORMSPEC_VERSION_STRING) +
+		std::string("formspec_version[1]") +
 		SIZE_TAG
 		"bgcolor[#320000b4;true]"
 		"label[4.85,1.35;" + gettext("You died") + "]"
@@ -4055,7 +4055,7 @@ void Game::showPauseMenu()
 	float ypos = simple_singleplayer_mode ? 0.7f : 0.1f;
 	std::ostringstream os;
 
-	os << FORMSPEC_VERSION_STRING << SIZE_TAG
+	os << "formspec_version[1]" << SIZE_TAG
 		<< "button_exit[4," << (ypos++) << ";3,0.5;btn_continue;"
 		<< strgettext("Continue") << "]";
 

diff --git a/src/network/networkprotocol.h b/src/network/networkprotocol.h
@@ -230,7 +230,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 		background[]: 9-slice scaling parameters
 */
 #define FORMSPEC_API_VERSION 2
-#define FORMSPEC_VERSION_STRING "formspec_version[" TOSTRING(FORMSPEC_API_VERSION) "]"
 
 #define TEXTURENAME_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_.-"