diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2012-12-16 17:47:51 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2012-12-24 10:02:00 -0800 |
| commit | b52127bcbf817ff8285b36d22198b275327e16bb (patch) | |
| tree | 7bc596289c011e719168bef846b8cf63bf5d4947 /src/map/intif.cpp | |
| parent | 4bd7eeec09629d3c0f900d42c899fe23c69e07b6 (diff) | |
| download | tmwa-b52127bcbf817ff8285b36d22198b275327e16bb.tar.gz tmwa-b52127bcbf817ff8285b36d22198b275327e16bb.tar.bz2 tmwa-b52127bcbf817ff8285b36d22198b275327e16bb.tar.xz tmwa-b52127bcbf817ff8285b36d22198b275327e16bb.zip | |
Cleanup headers and remove all uses of va_list except logging
Diffstat (limited to 'src/map/intif.cpp')
| -rw-r--r-- | src/map/intif.cpp | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/src/map/intif.cpp b/src/map/intif.cpp index b8d21f3..0107155 100644 --- a/src/map/intif.cpp +++ b/src/map/intif.cpp @@ -1,22 +1,19 @@ -// $Id: intif.c,v 1.2 2004/09/25 05:32:18 MouseJstr Exp $ -#include <sys/types.h> -#ifdef LCCWIN32 -#include <winsock.h> -#else -#include <sys/socket.h> +#include "intif.hpp" + +#include <arpa/inet.h> #include <netinet/in.h> -#endif -#include <stdio.h> -#include <stdlib.h> -#ifndef LCCWIN32 -#include <sys/time.h> #include <sys/ioctl.h> -#include <unistd.h> -#include <arpa/inet.h> -#endif -#include <signal.h> +#include <sys/socket.h> +#include <sys/time.h> +#include <sys/types.h> + #include <fcntl.h> -#include <string.h> +#include <unistd.h> + +#include <csignal> +#include <cstdio> +#include <cstdlib> +#include <cstring> #include "../common/nullpo.hpp" #include "../common/socket.hpp" @@ -25,17 +22,13 @@ #include "battle.hpp" #include "chrif.hpp" #include "clif.hpp" -#include "intif.hpp" #include "map.hpp" #include "party.hpp" #include "pc.hpp" #include "storage.hpp" -#ifdef MEMWATCH -#include "memwatch.hpp" -#endif - -static const int packet_len_table[] = { +static +const int packet_len_table[] = { -1, -1, 27, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 7, 0, 0, 0, 0, 0, 0, -1, 11, 0, 0, 0, 0, 0, 0, 35, -1, 11, 15, 34, 29, 7, -1, 0, 0, 0, 0, 0, 0, 0, 0, |