summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-06 14:55:47 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-06 14:55:47 +0300
commit773f760bc1a308152265c40161789d8ae318aba4 (patch)
tree58b56e08d110d78ae996c34118ed279a80f7520b /src
parent326ad8b0aa5ebdd55ec3f7d41238d578cafb3e23 (diff)
downloadmv-773f760bc1a308152265c40161789d8ae318aba4.tar.gz
mv-773f760bc1a308152265c40161789d8ae318aba4.tar.bz2
mv-773f760bc1a308152265c40161789d8ae318aba4.tar.xz
mv-773f760bc1a308152265c40161789d8ae318aba4.zip
Rename function AuctionHandler::cancelRequest into AuctionHandler::cancelReg.
Diffstat (limited to 'src')
-rw-r--r--src/net/auctionhandler.h2
-rw-r--r--src/net/eathena/auctionhandler.cpp4
-rw-r--r--src/net/eathena/auctionhandler.h2
-rw-r--r--src/net/eathena/protocol.h2
-rw-r--r--src/net/tmwa/auctionhandler.cpp2
-rw-r--r--src/net/tmwa/auctionhandler.h2
6 files changed, 7 insertions, 7 deletions
diff --git a/src/net/auctionhandler.h b/src/net/auctionhandler.h
index 1e8e7a459..a53815462 100644
--- a/src/net/auctionhandler.h
+++ b/src/net/auctionhandler.h
@@ -36,7 +36,7 @@ class AuctionHandler notfinal
virtual ~AuctionHandler()
{ }
- virtual void cancelRequest() const = 0;
+ virtual void cancelReg() const = 0;
virtual void setItem(const Item *const item,
const int amount) const = 0;
diff --git a/src/net/eathena/auctionhandler.cpp b/src/net/eathena/auctionhandler.cpp
index a3c911e59..f390e2aae 100644
--- a/src/net/eathena/auctionhandler.cpp
+++ b/src/net/eathena/auctionhandler.cpp
@@ -124,9 +124,9 @@ void AuctionHandler::processAuctionClose(Net::MessageIn &msg)
msg.readInt16("flag");
}
-void AuctionHandler::cancelRequest() const
+void AuctionHandler::cancelReg() const
{
- createOutPacket(CMSG_AUCTION_CANCEL_REQUEST);
+ createOutPacket(CMSG_AUCTION_CANCEL_REG);
outMsg.writeInt16(0, "type"); // unused
}
diff --git a/src/net/eathena/auctionhandler.h b/src/net/eathena/auctionhandler.h
index 987cb2e57..0c8ccee3a 100644
--- a/src/net/eathena/auctionhandler.h
+++ b/src/net/eathena/auctionhandler.h
@@ -36,7 +36,7 @@ class AuctionHandler final : public MessageHandler, public Net::AuctionHandler
void handleMessage(Net::MessageIn &msg) override final;
- void cancelRequest() const override final;
+ void cancelReg() const override final;
void setItem(const Item *const item,
const int amount) const override final;
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h
index a413fb587..8ec1ff842 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -516,7 +516,7 @@
#define CMSG_FRIENDS_REQUEST_ACK 0x0208
#define CMSG_FRIENDS_DELETE_PLAYER 0x020a
-#define CMSG_AUCTION_CANCEL_REQUEST 0x024b
+#define CMSG_AUCTION_CANCEL_REG 0x024b
#define CMSG_AUCTION_SET_ITEM 0x024c
#define CMSG_AUCTION_REGISTER 0x024d
diff --git a/src/net/tmwa/auctionhandler.cpp b/src/net/tmwa/auctionhandler.cpp
index f8030d48d..f59baf993 100644
--- a/src/net/tmwa/auctionhandler.cpp
+++ b/src/net/tmwa/auctionhandler.cpp
@@ -42,7 +42,7 @@ void AuctionHandler::handleMessage(Net::MessageIn &msg A_UNUSED)
{
}
-void AuctionHandler::cancelRequest() const
+void AuctionHandler::cancelReg() const
{
}
diff --git a/src/net/tmwa/auctionhandler.h b/src/net/tmwa/auctionhandler.h
index a18b88c70..12b543ff3 100644
--- a/src/net/tmwa/auctionhandler.h
+++ b/src/net/tmwa/auctionhandler.h
@@ -37,7 +37,7 @@ class AuctionHandler final : public MessageHandler, public Net::AuctionHandler
void handleMessage(Net::MessageIn &msg) override final;
- void cancelRequest() const override final;
+ void cancelReg() const override final;
void setItem(const Item *const item,
const int amount) const override final;