summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/Makefile.am4
-rw-r--r--src/net/eathena/auctionhandler.cpp12
-rw-r--r--src/net/eathena/auctionrecv.cpp (renamed from src/net/eathena/auction.cpp)12
-rw-r--r--src/net/eathena/auctionrecv.h (renamed from src/net/eathena/auction.h)2
5 files changed, 17 insertions, 17 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f4d3a0eaa..f388d94a3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1522,8 +1522,8 @@ SET(SRCS_EATHENA
net/eathena/adminrecv.h
net/eathena/adminhandler.cpp
net/eathena/adminhandler.h
- net/eathena/auction.cpp
- net/eathena/auction.h
+ net/eathena/auctionrecv.cpp
+ net/eathena/auctionrecv.h
net/eathena/auctionhandler.cpp
net/eathena/auctionhandler.h
net/eathena/bank.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 1a55783ed..1df31cea8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1368,8 +1368,8 @@ manaplus_SOURCES += gui/windows/bankwindow.cpp \
net/eathena/adminrecv.h \
net/eathena/adminhandler.cpp \
net/eathena/adminhandler.h \
- net/eathena/auction.cpp \
- net/eathena/auction.h \
+ net/eathena/auctionrecv.cpp \
+ net/eathena/auctionrecv.h \
net/eathena/auctionhandler.cpp \
net/eathena/auctionhandler.h \
net/eathena/bank.cpp \
diff --git a/src/net/eathena/auctionhandler.cpp b/src/net/eathena/auctionhandler.cpp
index 4ee007953..ddce77077 100644
--- a/src/net/eathena/auctionhandler.cpp
+++ b/src/net/eathena/auctionhandler.cpp
@@ -25,7 +25,7 @@
#include "net/ea/eaprotocol.h"
-#include "net/eathena/auction.h"
+#include "net/eathena/auctionrecv.h"
#include "net/eathena/messageout.h"
#include "net/eathena/protocol.h"
@@ -57,23 +57,23 @@ void AuctionHandler::handleMessage(Net::MessageIn &msg)
switch (msg.getId())
{
case SMSG_AUCTION_OPEN_WINDOW:
- Auction::processOpenWindow(msg);
+ AuctionRecv::processOpenWindow(msg);
break;
case SMSG_AUCTION_RESULTS:
- Auction::processAuctionResults(msg);
+ AuctionRecv::processAuctionResults(msg);
break;
case SMSG_AUCTION_SET_ITEM:
- Auction::processAuctionSetItem(msg);
+ AuctionRecv::processAuctionSetItem(msg);
break;
case SMSG_AUCTION_MESSAGE:
- Auction::processAuctionMessage(msg);
+ AuctionRecv::processAuctionMessage(msg);
break;
case SMSG_AUCTION_CLOSE:
- Auction::processAuctionClose(msg);
+ AuctionRecv::processAuctionClose(msg);
break;
default:
diff --git a/src/net/eathena/auction.cpp b/src/net/eathena/auctionrecv.cpp
index 558e822e0..4f1beddec 100644
--- a/src/net/eathena/auction.cpp
+++ b/src/net/eathena/auctionrecv.cpp
@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "net/eathena/auction.h"
+#include "net/eathena/auctionrecv.h"
#include "logger.h"
@@ -29,13 +29,13 @@
namespace EAthena
{
-void Auction::processOpenWindow(Net::MessageIn &msg)
+void AuctionRecv::processOpenWindow(Net::MessageIn &msg)
{
UNIMPLIMENTEDPACKET;
msg.readInt32("flag"); // 0 - open, 1 - close
}
-void Auction::processAuctionResults(Net::MessageIn &msg)
+void AuctionRecv::processAuctionResults(Net::MessageIn &msg)
{
UNIMPLIMENTEDPACKET;
msg.readInt16("len");
@@ -61,20 +61,20 @@ void Auction::processAuctionResults(Net::MessageIn &msg)
}
}
-void Auction::processAuctionSetItem(Net::MessageIn &msg)
+void AuctionRecv::processAuctionSetItem(Net::MessageIn &msg)
{
UNIMPLIMENTEDPACKET;
msg.readInt16("index");
msg.readUInt8("flag");
}
-void Auction::processAuctionMessage(Net::MessageIn &msg)
+void AuctionRecv::processAuctionMessage(Net::MessageIn &msg)
{
UNIMPLIMENTEDPACKET;
msg.readUInt8("message");
}
-void Auction::processAuctionClose(Net::MessageIn &msg)
+void AuctionRecv::processAuctionClose(Net::MessageIn &msg)
{
UNIMPLIMENTEDPACKET;
msg.readInt16("flag");
diff --git a/src/net/eathena/auction.h b/src/net/eathena/auctionrecv.h
index 675f7423d..583e873b9 100644
--- a/src/net/eathena/auction.h
+++ b/src/net/eathena/auctionrecv.h
@@ -29,7 +29,7 @@
namespace EAthena
{
- namespace Auction
+ namespace AuctionRecv
{
void processOpenWindow(Net::MessageIn &msg);
void processAuctionResults(Net::MessageIn &msg);