diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-08-22 14:46:54 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-08-22 14:46:54 +0300 |
| commit | 5415256a529eca1317b835ceea54a6ee6633cb97 (patch) | |
| tree | 85e53482194f189437bc848cbb225a235ac7fcac /src/game.cpp | |
| parent | 836e43db60ff1f3c9d160d0d58ba5a631c4293fc (diff) | |
| parent | 9c94538fb7a7d7712d8da21d16790359a853f575 (diff) | |
| download | minetest-5415256a529eca1317b835ceea54a6ee6633cb97.tar.gz minetest-5415256a529eca1317b835ceea54a6ee6633cb97.tar.bz2 minetest-5415256a529eca1317b835ceea54a6ee6633cb97.zip | |
Merge remote-tracking branch 'oblomov/me_cmd'
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/game.cpp b/src/game.cpp index 7bf1c6f5c..7c77996b8 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -114,18 +114,6 @@ struct TextDestChat : public TextDest // Discard empty line if(text == L"") return; - - // Parse command (server command starts with "/#") - if(text[0] == L'/' && text[1] != L'#') - { - std::wstring reply = L"Local: "; - - reply += L"Local commands not yet supported. " - L"Server prefix is \"/#\"."; - - m_client->addChatMessage(reply); - return; - } // Send to others m_client->sendChatMessage(text); @@ -1332,6 +1320,14 @@ void the_game( &g_menumgr, dest, L""))->drop(); } + else if(input->wasKeyDown(getKeySetting("keymap_cmd"))) + { + TextDest *dest = new TextDestChat(&client); + + (new GUITextInputMenu(guienv, guiroot, -1, + &g_menumgr, dest, + L"/"))->drop(); + } else if(input->wasKeyDown(getKeySetting("keymap_freemove"))) { if(g_settings.getBool("free_move")) |