BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Built-in formspecs: Force version 1

Browse Source
This commit is contained in:
SmallJoker 2019-09-14 20:31:07 +02:00
parent 8e42a25e57
commit 1de4ca1f9d
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/game.cpp
View File

@ -3981,7 +3981,7 @@ void Game::extendedResourceCleanup()
void Game::showDeathFormspec() void Game::showDeathFormspec()
{ {
static std::string formspec_str = static std::string formspec_str =
std::string(FORMSPEC_VERSION_STRING) + std::string("formspec_version[1]") +
SIZE_TAG SIZE_TAG
"bgcolor[#320000b4;true]" "bgcolor[#320000b4;true]"
"label[4.85,1.35;" + gettext("You died") + "]" "label[4.85,1.35;" + gettext("You died") + "]"
@ -4055,7 +4055,7 @@ void Game::showPauseMenu()
float ypos = simple_singleplayer_mode ? 0.7f : 0.1f; float ypos = simple_singleplayer_mode ? 0.7f : 0.1f;
std::ostringstream os; std::ostringstream os;
os << FORMSPEC_VERSION_STRING << SIZE_TAG os << "formspec_version[1]" << SIZE_TAG
<< "button_exit[4," << (ypos++) << ";3,0.5;btn_continue;" << "button_exit[4," << (ypos++) << ";3,0.5;btn_continue;"
<< strgettext("Continue") << "]"; << strgettext("Continue") << "]";

1
src/network/networkprotocol.h
View File

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