From 366de9963d24841483e6ed8ff4a88f775a1c2fcf Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 31 Aug 2015 01:59:16 +0300 Subject: Rename packetdefine.h to protocoldefine.h --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/net/eathena/protocol.h | 3 ++- src/net/packetdefine.h | 26 -------------------------- src/net/protocoldefine.h | 26 ++++++++++++++++++++++++++ src/net/tmwa/protocol.h | 2 +- 6 files changed, 31 insertions(+), 30 deletions(-) delete mode 100644 src/net/packetdefine.h create mode 100644 src/net/protocoldefine.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fc285ef7d..479d6544d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -574,9 +574,9 @@ SET(SRCS net/worldinfo.h net/packetcounters.cpp net/packetcounters.h - net/packetdefine.h net/packetlimiter.cpp net/packetlimiter.h + net/protocoldefine.h resources/action.cpp resources/action.h resources/ambientlayer.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 1c5e64350..144d4118b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1178,9 +1178,9 @@ manaplus_SOURCES += main.cpp \ net/worldinfo.h \ net/packetcounters.cpp \ net/packetcounters.h \ - net/packetdefine.h \ net/packetlimiter.cpp \ net/packetlimiter.h \ + net/protocoldefine.h \ net/ea/adminrecv.cpp \ net/ea/adminrecv.h \ net/ea/adminhandler.cpp \ diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h index 221066df5..21dab17d7 100644 --- a/src/net/eathena/protocol.h +++ b/src/net/eathena/protocol.h @@ -23,7 +23,8 @@ #ifndef NET_EATHENA_PROTOCOL_H #define NET_EATHENA_PROTOCOL_H -#include "net/packetdefine.h" +#include "net/protocoldefine.h" + #include "net/eathena/packets.inc" #undef packet diff --git a/src/net/packetdefine.h b/src/net/packetdefine.h deleted file mode 100644 index a44289994..000000000 --- a/src/net/packetdefine.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2015 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef NET_PACKETDEFINE_H -#define NET_PACKETDEFINE_H - -#define packet(name, id) static const int name = id - -#endif // NET_PACKETDEFINE_H diff --git a/src/net/protocoldefine.h b/src/net/protocoldefine.h new file mode 100644 index 000000000..a44289994 --- /dev/null +++ b/src/net/protocoldefine.h @@ -0,0 +1,26 @@ +/* + * The ManaPlus Client + * Copyright (C) 2015 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef NET_PACKETDEFINE_H +#define NET_PACKETDEFINE_H + +#define packet(name, id) static const int name = id + +#endif // NET_PACKETDEFINE_H diff --git a/src/net/tmwa/protocol.h b/src/net/tmwa/protocol.h index fc53778b1..564dfb8a7 100644 --- a/src/net/tmwa/protocol.h +++ b/src/net/tmwa/protocol.h @@ -23,7 +23,7 @@ #ifndef NET_TMWA_PROTOCOL_H #define NET_TMWA_PROTOCOL_H -#include "net/packetdefine.h" +#include "net/protocoldefine.h" #include "net/tmwa/packets.inc" -- cgit v1.2.3-70-g09d2