diff options
| author | SmallJoker <mk939@ymail.com> | 2019-09-14 20:31:07 +0200 |
|---|---|---|
| committer | SmallJoker <mk939@ymail.com> | 2019-09-14 20:42:54 +0200 |
| commit | 1de4ca1f9dc85d8cb1e1fdb369e3fe48e76590dc (patch) | |
| tree | b07dd98479873277890dfa9fe43d51c8dcc850f9 /src | |
| parent | 8e42a25e570565b2ad30717b914ace84b08c87ec (diff) | |
| download | minetest-1de4ca1f9dc85d8cb1e1fdb369e3fe48e76590dc.tar.gz minetest-1de4ca1f9dc85d8cb1e1fdb369e3fe48e76590dc.tar.bz2 minetest-1de4ca1f9dc85d8cb1e1fdb369e3fe48e76590dc.zip | |
Built-in formspecs: Force version 1
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/game.cpp | 4 | ||||
| -rw-r--r-- | src/network/networkprotocol.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/client/game.cpp b/src/client/game.cpp index bc35ade85..2b0976649 100644 --- 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 index f603ed6c5..52cdf489c 100644 --- 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_.-" |