From cb1a1603e744fd5b7925171b4798b7045b563f63 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 1 Sep 2015 00:31:47 +0300 Subject: Change extension in some internals includes from h to inc. --- src/CMakeLists.txt | 4 ++-- src/Makefile.am | 4 ++-- src/net/eathena/network.cpp | 2 +- src/net/eathena/recvpackets.h | 28 ---------------------------- src/net/eathena/recvpackets.inc | 28 ++++++++++++++++++++++++++++ src/net/tmwa/network.cpp | 2 +- src/net/tmwa/recvpackets.h | 28 ---------------------------- src/net/tmwa/recvpackets.inc | 28 ++++++++++++++++++++++++++++ 8 files changed, 62 insertions(+), 62 deletions(-) delete mode 100644 src/net/eathena/recvpackets.h create mode 100644 src/net/eathena/recvpackets.inc delete mode 100644 src/net/tmwa/recvpackets.h create mode 100644 src/net/tmwa/recvpackets.inc diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 497c7965b..9b350f5e3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1484,7 +1484,7 @@ SET(SRCS_TMWA net/tmwa/questhandler.h net/tmwa/questrecv.cpp net/tmwa/questrecv.h - net/tmwa/recvpackets.h + net/tmwa/recvpackets.inc net/tmwa/serverfeatures.cpp net/tmwa/serverfeatures.h net/tmwa/skillhandler.cpp @@ -1709,7 +1709,7 @@ SET(SRCS_EATHENA net/eathena/questhandler.h net/eathena/questrecv.cpp net/eathena/questrecv.h - net/eathena/recvpackets.h + net/eathena/recvpackets.inc net/eathena/roulettehandler.cpp net/eathena/roulettehandler.h net/eathena/rouletterecv.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 881a75825..929866e66 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1327,7 +1327,7 @@ manaplus_SOURCES += \ net/tmwa/questhandler.h \ net/tmwa/questrecv.cpp \ net/tmwa/questrecv.h \ - net/tmwa/recvpackets.h \ + net/tmwa/recvpackets.inc \ net/tmwa/serverfeatures.cpp \ net/tmwa/serverfeatures.h \ net/tmwa/skillhandler.cpp \ @@ -1555,7 +1555,7 @@ manaplus_SOURCES += gui/windows/bankwindow.cpp \ net/eathena/questhandler.h \ net/eathena/questrecv.cpp \ net/eathena/questrecv.h \ - net/eathena/recvpackets.h \ + net/eathena/recvpackets.inc \ net/eathena/roulettehandler.cpp \ net/eathena/roulettehandler.h \ net/eathena/rouletterecv.cpp \ diff --git a/src/net/eathena/network.cpp b/src/net/eathena/network.cpp index 83dfb0796..ed6f6f1f7 100644 --- a/src/net/eathena/network.cpp +++ b/src/net/eathena/network.cpp @@ -50,7 +50,7 @@ Network::Network() : mInstance = this; memset(&mMessageHandlers[0], 0, sizeof(MessageHandler*) * 0xffff); mPackets = new PacketInfo[messagesSize]; -#include "net/eathena/recvpackets.h" +#include "net/eathena/recvpackets.inc" } Network::~Network() diff --git a/src/net/eathena/recvpackets.h b/src/net/eathena/recvpackets.h deleted file mode 100644 index e14b1252b..000000000 --- a/src/net/eathena/recvpackets.h +++ /dev/null @@ -1,28 +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_EATHENA_RECVPACKETS_H -#define NET_EATHENA_RECVPACKETS_H - -#include "net/recvpacketdefine.h" - -#include "net/eathena/packets.inc" - -#endif // NET_EATHENA_RECVPACKETS_H diff --git a/src/net/eathena/recvpackets.inc b/src/net/eathena/recvpackets.inc new file mode 100644 index 000000000..e14b1252b --- /dev/null +++ b/src/net/eathena/recvpackets.inc @@ -0,0 +1,28 @@ +/* + * 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_EATHENA_RECVPACKETS_H +#define NET_EATHENA_RECVPACKETS_H + +#include "net/recvpacketdefine.h" + +#include "net/eathena/packets.inc" + +#endif // NET_EATHENA_RECVPACKETS_H diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp index 8095c1251..64f5047fe 100644 --- a/src/net/tmwa/network.cpp +++ b/src/net/tmwa/network.cpp @@ -50,7 +50,7 @@ Network::Network() : mInstance = this; memset(&mMessageHandlers[0], 0, sizeof(MessageHandler*) * 0xffff); mPackets = new PacketInfo[messagesSize]; -#include "net/tmwa/recvpackets.h" +#include "net/tmwa/recvpackets.inc" } Network::~Network() diff --git a/src/net/tmwa/recvpackets.h b/src/net/tmwa/recvpackets.h deleted file mode 100644 index 59c12fec2..000000000 --- a/src/net/tmwa/recvpackets.h +++ /dev/null @@ -1,28 +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_TMWA_RECVPACKETS_H -#define NET_TMWA_RECVPACKETS_H - -#include "net/recvpacketdefine.h" - -#include "net/tmwa/packets.inc" - -#endif // NET_TMWA_RECVPACKETS_H diff --git a/src/net/tmwa/recvpackets.inc b/src/net/tmwa/recvpackets.inc new file mode 100644 index 000000000..59c12fec2 --- /dev/null +++ b/src/net/tmwa/recvpackets.inc @@ -0,0 +1,28 @@ +/* + * 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_TMWA_RECVPACKETS_H +#define NET_TMWA_RECVPACKETS_H + +#include "net/recvpacketdefine.h" + +#include "net/tmwa/packets.inc" + +#endif // NET_TMWA_RECVPACKETS_H -- cgit v1.2.3-60-g2f50