From 8ed89ded1f45665fadd1e16ddc5d1b4962ad2182 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 20 May 2014 22:16:03 +0300 Subject: Move net sprite defines into separate file. --- src/net/eathena/beinghandler.cpp | 1 + src/net/eathena/charserverhandler.cpp | 1 + src/net/eathena/protocol.h | 19 --------------- src/net/eathena/sprite.h | 45 +++++++++++++++++++++++++++++++++++ src/net/tmwa/beinghandler.cpp | 1 + src/net/tmwa/charserverhandler.cpp | 1 + src/net/tmwa/protocol.h | 19 --------------- src/net/tmwa/sprite.h | 45 +++++++++++++++++++++++++++++++++++ 8 files changed, 94 insertions(+), 38 deletions(-) create mode 100644 src/net/eathena/sprite.h create mode 100644 src/net/tmwa/sprite.h (limited to 'src/net') diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index 136f19b03..e32ced211 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -38,6 +38,7 @@ #include "net/eathena/messageout.h" #include "net/eathena/protocol.h" +#include "net/eathena/sprite.h" #include "resources/iteminfo.h" diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp index cd7496086..15a122b9e 100644 --- a/src/net/eathena/charserverhandler.cpp +++ b/src/net/eathena/charserverhandler.cpp @@ -35,6 +35,7 @@ #include "net/eathena/messageout.h" #include "net/eathena/network.h" #include "net/eathena/protocol.h" +#include "net/eathena/sprite.h" #include "resources/iteminfo.h" diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h index dfe3cc979..598f62101 100644 --- a/src/net/eathena/protocol.h +++ b/src/net/eathena/protocol.h @@ -49,25 +49,6 @@ namespace EAthena }; } // namespace EAthena -enum -{ - SPRITE_BASE = 0, - SPRITE_SHOE, - SPRITE_BOTTOMCLOTHES, - SPRITE_TOPCLOTHES, - SPRITE_MISC1, - SPRITE_MISC2, - SPRITE_HAIR, - SPRITE_HAT, - SPRITE_CAPE, - SPRITE_GLOVES, - SPRITE_WEAPON, - SPRITE_SHIELD, - SPRITE_EVOL1, - SPRITE_EVOL2, - SPRITE_VECTOREND -}; - /********************************* * Packets from server to client * *********************************/ diff --git a/src/net/eathena/sprite.h b/src/net/eathena/sprite.h new file mode 100644 index 000000000..65bba131c --- /dev/null +++ b/src/net/eathena/sprite.h @@ -0,0 +1,45 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2014 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_SPRITE_H +#define NET_EATHENA_SPRITE_H + +enum +{ + SPRITE_BASE = 0, + SPRITE_SHOE, + SPRITE_BOTTOMCLOTHES, + SPRITE_TOPCLOTHES, + SPRITE_MISC1, + SPRITE_MISC2, + SPRITE_HAIR, + SPRITE_HAT, + SPRITE_CAPE, + SPRITE_GLOVES, + SPRITE_WEAPON, + SPRITE_SHIELD, + SPRITE_EVOL1, + SPRITE_EVOL2, + SPRITE_VECTOREND +}; + +#endif // NET_EATHENA_SPRITE_H diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index 5bd39457a..28c167e86 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -32,6 +32,7 @@ #include "net/tmwa/messageout.h" #include "net/tmwa/protocol.h" +#include "net/tmwa/sprite.h" #include "resources/iteminfo.h" diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index 47a55561e..256f30296 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -35,6 +35,7 @@ #include "net/tmwa/messageout.h" #include "net/tmwa/network.h" #include "net/tmwa/protocol.h" +#include "net/tmwa/sprite.h" #include "resources/iteminfo.h" diff --git a/src/net/tmwa/protocol.h b/src/net/tmwa/protocol.h index 17d6a4cc8..6ff1b45ab 100644 --- a/src/net/tmwa/protocol.h +++ b/src/net/tmwa/protocol.h @@ -49,25 +49,6 @@ namespace TmwAthena }; } // namespace TmwAthena -enum -{ - SPRITE_BASE = 0, - SPRITE_SHOE, - SPRITE_BOTTOMCLOTHES, - SPRITE_TOPCLOTHES, - SPRITE_MISC1, - SPRITE_MISC2, - SPRITE_HAIR, - SPRITE_HAT, - SPRITE_CAPE, - SPRITE_GLOVES, - SPRITE_WEAPON, - SPRITE_SHIELD, - SPRITE_EVOL1, - SPRITE_EVOL2, - SPRITE_VECTOREND -}; - /********************************* * Packets from server to client * *********************************/ diff --git a/src/net/tmwa/sprite.h b/src/net/tmwa/sprite.h new file mode 100644 index 000000000..24d47e1c9 --- /dev/null +++ b/src/net/tmwa/sprite.h @@ -0,0 +1,45 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2014 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_SPRITE_H +#define NET_TMWA_SPRITE_H + +enum +{ + SPRITE_BASE = 0, + SPRITE_SHOE, + SPRITE_BOTTOMCLOTHES, + SPRITE_TOPCLOTHES, + SPRITE_MISC1, + SPRITE_MISC2, + SPRITE_HAIR, + SPRITE_HAT, + SPRITE_CAPE, + SPRITE_GLOVES, + SPRITE_WEAPON, + SPRITE_SHIELD, + SPRITE_EVOL1, + SPRITE_EVOL2, + SPRITE_VECTOREND +}; + +#endif // NET_TMWA_SPRITE_H -- cgit v1.2.3-60-g2f50