From a6a60342beacd628626c861b835688babcddcca0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 7 May 2016 22:54:40 +0300 Subject: Move max packet version constant into separate file. --- src/CMakeLists.txt | 1 + src/Makefile.am | 1 + src/const/net/maxpacketversion.h | 32 ++++++++++++++++++++++++++++++++ src/gui/windows/editserverdialog.cpp | 4 +++- 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 src/const/net/maxpacketversion.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 351191456..8ac757636 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -563,6 +563,7 @@ SET(SRCS net/net.cpp net/net.h const/net/inventory.h + const/net/maxpacketversion.h const/net/net.h const/net/nostat.h net/partyhandler.h diff --git a/src/Makefile.am b/src/Makefile.am index 4051ac3a0..1e30fd8af 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1304,6 +1304,7 @@ manaplus_SOURCES += main.cpp \ net/net.cpp \ net/net.h \ const/net/inventory.h \ + const/net/maxpacketversion.h \ const/net/net.h \ const/net/nostat.h \ net/npchandler.h \ diff --git a/src/const/net/maxpacketversion.h b/src/const/net/maxpacketversion.h new file mode 100644 index 000000000..d684297d5 --- /dev/null +++ b/src/const/net/maxpacketversion.h @@ -0,0 +1,32 @@ +/* + * The ManaPlus Client + * Copyright (C) 2013-2016 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 CONST_NET_MAXPACKETVERSION_H +#define CONST_NET_MAXPACKETVERSION_H + +#if defined(__GXX_EXPERIMENTAL_CXX0X__) +#include +#else +#include +#endif + +static const uint32_t maxPacketVersion = 20150916; + +#endif // CONST_NET_MAXPACKETVERSION_H diff --git a/src/gui/windows/editserverdialog.cpp b/src/gui/windows/editserverdialog.cpp index 9fa71b1f4..154dca6b4 100644 --- a/src/gui/windows/editserverdialog.cpp +++ b/src/gui/windows/editserverdialog.cpp @@ -21,6 +21,8 @@ #include "gui/windows/editserverdialog.h" +#include "const/net/maxpacketversion.h" + #include "gui/models/typelistmodel.h" #include "gui/windows/okdialog.h" @@ -50,7 +52,7 @@ EditServerDialog::EditServerDialog(ServerDialog *const parent, mNameField(new TextField(this, std::string())), mDescriptionField(new TextField(this, std::string())), mOnlineListUrlField(new TextField(this, std::string())), - mPacketVersionField(new IntTextField(this, 0, 0, 20150805)), + mPacketVersionField(new IntTextField(this, 0, 0, maxPacketVersion)), // TRANSLATORS: edit server dialog button mConnectButton(new Button(this, _("Connect"), "connect", this)), // TRANSLATORS: edit server dialog button -- cgit v1.2.3-60-g2f50