diff options
| author | realOneplustwo <oneplustwoisyes@gmail.com> | 2020-10-23 08:34:58 -0700 |
|---|---|---|
| committer | realOneplustwo <oneplustwoisyes@gmail.com> | 2020-10-23 08:34:58 -0700 |
| commit | 8e9e76a5076db0042773c6b925698f018a208b29 (patch) | |
| tree | a9b14f1a5aa210aedf2549ef473c03197f9f5347 /src | |
| parent | 6652d7ac2a463581aa53c1599b7b93762422ff0f (diff) | |
| download | dragonfireclient-8e9e76a5076db0042773c6b925698f018a208b29.tar.xz | |
Revert "Add Block Formspec Hack"
This reverts commit 6652d7ac2a463581aa53c1599b7b93762422ff0f.
Diffstat (limited to 'src')
| -rw-r--r-- | src/defaultsettings.cpp | 1 | ||||
| -rw-r--r-- | src/gui/cheatMenu.h | 2 | ||||
| -rw-r--r-- | src/network/clientpackethandler.cpp | 4 |
3 files changed, 1 insertions, 6 deletions
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 6a37ebab9..525f94678 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -118,7 +118,6 @@ void set_default_settings(Settings *settings) settings->setDefault("crystal_pvp", "false"); settings->setDefault("autototem", "false"); settings->setDefault("dont_point_nodes", "false"); - settings->setDefault("block_formspec", "false"); // Keymap settings->setDefault("remote_port", "30000"); diff --git a/src/gui/cheatMenu.h b/src/gui/cheatMenu.h index 513d217b6..c25af5ed2 100644 --- a/src/gui/cheatMenu.h +++ b/src/gui/cheatMenu.h @@ -72,7 +72,7 @@ private: video::SColor m_font_color = video::SColor(195, 255, 255, 255); video::SColor m_selected_font_color = video::SColor(235, 255, 255, 255); - FontMode fontStringToEnum(std::string str) + FontMode fontStringToEnum(std::string str); Client *m_client; diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp index f3c2bc134..f0fb09fad 100644 --- a/src/network/clientpackethandler.cpp +++ b/src/network/clientpackethandler.cpp @@ -957,10 +957,6 @@ void Client::handleCommand_DetachedInventory(NetworkPacket* pkt) void Client::handleCommand_ShowFormSpec(NetworkPacket* pkt) { - if (g_settings->getBool("block_formspec")) { - return; - } - std::string formspec = pkt->readLongString(); std::string formname; |