summaryrefslogtreecommitdiff
path: root/src/net/eathena/npchandler.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-08-27 21:26:15 +0300
committerAndrei Karas <akaras@inbox.ru>2015-08-27 21:26:15 +0300
commite6e9b2c524f28e18f7efa582ee0dd0ee1e1420df (patch)
tree02e52352e86985edc08308b22731473da7c9b4a9 /src/net/eathena/npchandler.cpp
parent2dbb62e760853f88a19e6e783870de156d52f8c6 (diff)
downloadplus-e6e9b2c524f28e18f7efa582ee0dd0ee1e1420df.tar.gz
plus-e6e9b2c524f28e18f7efa582ee0dd0ee1e1420df.tar.bz2
plus-e6e9b2c524f28e18f7efa582ee0dd0ee1e1420df.tar.xz
plus-e6e9b2c524f28e18f7efa582ee0dd0ee1e1420df.zip
Move receive code from npchandler into separate file.
Diffstat (limited to 'src/net/eathena/npchandler.cpp')
-rw-r--r--src/net/eathena/npchandler.cpp122
1 files changed, 30 insertions, 92 deletions
diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp
index 7b376fbeb..1ed4cb077 100644
--- a/src/net/eathena/npchandler.cpp
+++ b/src/net/eathena/npchandler.cpp
@@ -30,7 +30,10 @@
#include "gui/widgets/createwidget.h"
+#include "net/ea/npcrecv.h"
+
#include "net/eathena/messageout.h"
+#include "net/eathena/npcrecv.h"
#include "net/eathena/protocol.h"
#include "net/ea/eaprotocol.h"
@@ -74,70 +77,70 @@ void NpcHandler::handleMessage(Net::MessageIn &msg)
switch (msg.getId())
{
case SMSG_NPC_CHOICE:
- processNpcChoice(msg);
+ Ea::NpcRecv::processNpcChoice(msg);
break;
case SMSG_NPC_MESSAGE:
- processNpcMessage(msg);
+ Ea::NpcRecv::processNpcMessage(msg);
break;
case SMSG_NPC_CLOSE:
- processNpcClose(msg);
+ Ea::NpcRecv::processNpcClose(msg);
break;
case SMSG_NPC_NEXT:
- processNpcNext(msg);
+ Ea::NpcRecv::processNpcNext(msg);
break;
case SMSG_NPC_INT_INPUT:
- processNpcIntInput(msg);
+ Ea::NpcRecv::processNpcIntInput(msg);
break;
case SMSG_NPC_STR_INPUT:
- processNpcStrInput(msg);
+ Ea::NpcRecv::processNpcStrInput(msg);
break;
case SMSG_NPC_CUTIN:
- processNpcCutin(msg);
+ NpcRecv::processNpcCutin(msg);
break;
case SMSG_NPC_VIEWPOINT:
- processNpcViewPoint(msg);
+ NpcRecv::processNpcViewPoint(msg);
break;
case SMSG_NPC_SHOW_PROGRESS_BAR:
- processNpcShowProgressBar(msg);
+ NpcRecv::processNpcShowProgressBar(msg);
break;
case SMSG_NPC_CLOSE_TIMEOUT:
- processNpcCloseTimeout(msg);
+ NpcRecv::processNpcCloseTimeout(msg);
break;
case SMSG_NPC_COMMAND:
- processNpcCommand(msg);
+ Ea::NpcRecv::processNpcCommand(msg);
break;
case SMSG_NPC_CHANGETITLE:
- processChangeTitle(msg);
+ Ea::NpcRecv::processChangeTitle(msg);
break;
case SMSG_NPC_AREA:
- processArea(msg);
+ NpcRecv::processArea(msg);
break;
case SMSG_NPC_SHOW_DIGIT:
- processShowDigit(msg);
+ NpcRecv::processShowDigit(msg);
break;
case SMSG_NPC_PROGRESS_BAR_ABORT:
- processProgressBarAbort(msg);
+ NpcRecv::processProgressBarAbort(msg);
break;
default:
break;
}
- mDialog = nullptr;
+ Ea::NpcRecv::mDialog = nullptr;
}
void NpcHandler::talk(const BeingId npcId) const
@@ -164,8 +167,8 @@ void NpcHandler::closeDialog(const BeingId npcId)
NpcDialog *const dialog = (*it).second;
if (dialog)
dialog->close();
- if (dialog == mDialog)
- mDialog = nullptr;
+ if (dialog == Ea::NpcRecv::mDialog)
+ Ea::NpcRecv::mDialog = nullptr;
NpcDialog::mNpcDialogs.erase(it);
}
}
@@ -298,7 +301,7 @@ BeingId NpcHandler::getNpc(Net::MessageIn &msg)
const BeingId npcId = msg.readBeingId("npc id");
const NpcDialogs::const_iterator diag = NpcDialog::mNpcDialogs.find(npcId);
- mDialog = nullptr;
+ Ea::NpcRecv::mDialog = nullptr;
if (msg.getId() == SMSG_NPC_VIEWPOINT)
return npcId;
@@ -318,88 +321,23 @@ BeingId NpcHandler::getNpc(Net::MessageIn &msg)
}
else
{
- CREATEWIDGETV(mDialog, NpcDialog, npcId);
- mDialog->saveCamera();
+ CREATEWIDGETV(Ea::NpcRecv::mDialog, NpcDialog, npcId);
+ Ea::NpcRecv::mDialog->saveCamera();
if (localPlayer)
localPlayer->stopWalking(false);
- NpcDialog::mNpcDialogs[npcId] = mDialog;
+ NpcDialog::mNpcDialogs[npcId] = Ea::NpcRecv::mDialog;
}
}
else
{
NpcDialog *const dialog = diag->second;
- if (mDialog && mDialog != dialog)
- mDialog->restoreCamera();
- mDialog = dialog;
- if (mDialog)
- mDialog->saveCamera();
+ if (Ea::NpcRecv::mDialog && Ea::NpcRecv::mDialog != dialog)
+ Ea::NpcRecv::mDialog->restoreCamera();
+ Ea::NpcRecv::mDialog = dialog;
+ if (Ea::NpcRecv::mDialog)
+ Ea::NpcRecv::mDialog->saveCamera();
}
return npcId;
}
-void NpcHandler::processNpcCutin(Net::MessageIn &msg)
-{
- UNIMPLIMENTEDPACKET;
- mRequestLang = false;
- msg.readString(64, "image name");
- msg.readUInt8("type");
-}
-
-void NpcHandler::processNpcViewPoint(Net::MessageIn &msg)
-{
- UNIMPLIMENTEDPACKET;
- mRequestLang = false;
- // +++ probably need add nav point and start moving to it
- msg.readInt32("npc id");
- msg.readInt32("type"); // 0 display for 15 sec,
- // 1 display until teleport,
- // 2 remove
- msg.readInt32("x");
- msg.readInt32("y");
- msg.readUInt8("number"); // can be used for scripts
- msg.readInt32("color");
-}
-
-void NpcHandler::processNpcShowProgressBar(Net::MessageIn &msg)
-{
- UNIMPLIMENTEDPACKET;
- mRequestLang = false;
- // +++ probably need show progress bar in npc dialog
- msg.readInt32("color");
- msg.readInt32("seconds");
-}
-
-void NpcHandler::processNpcCloseTimeout(Net::MessageIn &msg)
-{
- UNIMPLIMENTEDPACKET;
- mRequestLang = false;
- // this packet send after npc closed by timeout.
- msg.readInt32("npc id");
-}
-
-void NpcHandler::processArea(Net::MessageIn &msg)
-{
- const int len = msg.readInt16("len");
- if (len < 12)
- return;
- Being *const dstBeing = actorManager->findBeing(
- msg.readBeingId("npc id"));
- const int area = msg.readInt32("area size");
- if (dstBeing)
- dstBeing->setAreaSize(area);
-}
-
-void NpcHandler::processShowDigit(Net::MessageIn &msg)
-{
- UNIMPLIMENTEDPACKET;
-
- msg.readUInt8("type");
- msg.readInt32("value");
-}
-
-void NpcHandler::processProgressBarAbort(Net::MessageIn &msg)
-{
- UNIMPLIMENTEDPACKET;
-}
-
} // namespace EAthena