diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-09-08 13:56:21 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-09-08 13:56:21 +0300 |
| commit | d1b123a4da2c51f82011841000949322e05ecba5 (patch) | |
| tree | 110dc78af88ce8436f388f907fc6c0b22d14b514 /src/net/ea | |
| parent | 1a21f967e71660f9c48b7cbd93e315ff40316994 (diff) | |
| download | manaplus-d1b123a4da2c51f82011841000949322e05ecba5.tar.gz manaplus-d1b123a4da2c51f82011841000949322e05ecba5.tar.bz2 manaplus-d1b123a4da2c51f82011841000949322e05ecba5.tar.xz manaplus-d1b123a4da2c51f82011841000949322e05ecba5.zip | |
Remove processLangReuqest.
Diffstat (limited to 'src/net/ea')
| -rw-r--r-- | src/net/ea/npchandler.cpp | 19 | ||||
| -rw-r--r-- | src/net/ea/npchandler.h | 2 |
2 files changed, 10 insertions, 11 deletions
diff --git a/src/net/ea/npchandler.cpp b/src/net/ea/npchandler.cpp index 5a2140f7a..ef43acd25 100644 --- a/src/net/ea/npchandler.cpp +++ b/src/net/ea/npchandler.cpp @@ -109,18 +109,19 @@ void NpcHandler::processNpcIntInput(Net::MessageIn &msg A_UNUSED) mDialog->integerRequest(0); } -void NpcHandler::processNpcStrInput(Net::MessageIn &msg A_UNUSED) +void NpcHandler::processNpcStrInput(Net::MessageIn &msg) { // Request for a string - if (mDialog) + int npcId = getNpc(msg); + if (mRequestLang) + { + mRequestLang = false; + stringInput(npcId, getLangSimple()); + } + else if (mDialog) + { mDialog->textRequest(""); -} - -void NpcHandler::processLangReuqest(Net::MessageIn &msg A_UNUSED, - const int npcId) -{ - mRequestLang = false; - stringInput(npcId, getLangSimple()); + } } } // namespace Ea diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h index 11ffacb59..81e92d84a 100644 --- a/src/net/ea/npchandler.h +++ b/src/net/ea/npchandler.h @@ -63,8 +63,6 @@ class NpcHandler notfinal : public Net::NpcHandler void processNpcStrInput(Net::MessageIn &msg); - void processLangReuqest(Net::MessageIn &msg, const int npcId); - protected: NpcHandler(); |