From 9978e58ee7d9a15814b939fa8dd42254e16702b2 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Wed, 5 Jan 2005 14:37:13 +0000 Subject: Removed bugging cancel button from npc dialog and fixed npc sprites. --- src/net/network.cpp | 4 ++-- src/net/network.h | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src/net') diff --git a/src/net/network.cpp b/src/net/network.cpp index 993abbc7..0162d246 100644 --- a/src/net/network.cpp +++ b/src/net/network.cpp @@ -17,6 +17,8 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * $Id$ */ #include "network.h" @@ -171,5 +173,3 @@ void flush() { } else RFIFOSET(ret); // Set size of available data to read } } - - diff --git a/src/net/network.h b/src/net/network.h index 937f9c61..db342f91 100644 --- a/src/net/network.h +++ b/src/net/network.h @@ -17,15 +17,17 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * $Id$ */ +#ifndef _TMW_NETWORK_H +#define _TMW_NETWORK_H + #ifdef WIN32 #pragma warning (disable:4312) #endif -#ifndef _NETWORK_H -#define _NETWORK_H - #ifdef WIN32 #include #include -- cgit v1.2.3-70-g09d2