summaryrefslogtreecommitdiff
path: root/src/char
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-01-21 21:50:36 -0800
committerBen Longbons <b.r.longbons@gmail.com>2013-02-01 12:36:51 -0800
commit90f2d2aeffdb345e9fdfc5c3e56fffa71281f2ee (patch)
tree42667ee8211853727c14645c05280e2500a7a994 /src/char
parentb3ca4bccc4fa6b7f5d637bdecb4fac6ca9649f3c (diff)
downloadtmwa-90f2d2aeffdb345e9fdfc5c3e56fffa71281f2ee.tar.gz
tmwa-90f2d2aeffdb345e9fdfc5c3e56fffa71281f2ee.tar.bz2
tmwa-90f2d2aeffdb345e9fdfc5c3e56fffa71281f2ee.tar.xz
tmwa-90f2d2aeffdb345e9fdfc5c3e56fffa71281f2ee.zip
Remove unnecessary includes, speeding up recompilation
Diffstat (limited to 'src/char')
-rw-r--r--src/char/char.cpp13
-rw-r--r--src/char/int_party.cpp1
-rw-r--r--src/char/int_storage.cpp14
-rw-r--r--src/char/inter.cpp3
4 files changed, 9 insertions, 22 deletions
diff --git a/src/char/char.cpp b/src/char/char.cpp
index 093edc3..a45592d 100644
--- a/src/char/char.cpp
+++ b/src/char/char.cpp
@@ -1,31 +1,23 @@
#include "char.hpp"
#include <arpa/inet.h>
-#include <netinet/in.h>
-#include <sys/ioctl.h>
#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/types.h>
#include <sys/wait.h>
-#include <fcntl.h>
#include <netdb.h>
#include <unistd.h>
-#include <cstdio>
#include <cstdlib>
-#include <csignal>
#include <cstring>
#include <ctime>
#include <fstream>
-#include <algorithm>
#include "../common/core.hpp"
#include "../common/cxxstdio.hpp"
+#include "../common/db.hpp"
#include "../common/extract.hpp"
#include "../common/lock.hpp"
-#include "../common/mmo.hpp"
#include "../common/socket.hpp"
#include "../common/timer.hpp"
#include "../common/version.hpp"
@@ -1279,7 +1271,6 @@ void parse_tologin(int fd)
fd);
login_fd = -1;
}
- close(fd);
delete_session(fd);
return;
}
@@ -1762,7 +1753,6 @@ void parse_frommap(int fd)
online_chars[j] = -1;
create_online_files(); // update online players files (to remove all online players of this server)
}
- close(fd);
delete_session(fd);
return;
}
@@ -2424,7 +2414,6 @@ void parse_char(int fd)
{ // disconnect any player (already connected to char-server or coming back from map-server) if login-server is diconnected.
if (fd == login_fd)
login_fd = -1;
- close(fd);
delete_session(fd);
return;
}
diff --git a/src/char/int_party.cpp b/src/char/int_party.cpp
index fccb0c2..065398a 100644
--- a/src/char/int_party.cpp
+++ b/src/char/int_party.cpp
@@ -1,6 +1,5 @@
#include "int_party.hpp"
-#include <cstdio>
#include <cstdlib>
#include <cstring>
diff --git a/src/char/int_storage.cpp b/src/char/int_storage.cpp
index 6568d10..9ca841f 100644
--- a/src/char/int_storage.cpp
+++ b/src/char/int_storage.cpp
@@ -1,5 +1,11 @@
#include "int_storage.hpp"
+#include <cstdlib>
+#include <cstring>
+
+#include <functional>
+#include <fstream>
+
#include "../common/cxxstdio.hpp"
#include "../common/db.hpp"
#include "../common/extract.hpp"
@@ -7,14 +13,6 @@
#include "../common/mmo.hpp"
#include "../common/socket.hpp"
-#include "char.hpp"
-#include "inter.hpp"
-
-#include <cstdlib>
-#include <cstring>
-
-#include <fstream>
-
#include "../poison.hpp"
// ファイル名のデフォルト
diff --git a/src/char/inter.cpp b/src/char/inter.cpp
index fe82ac3..8015ae9 100644
--- a/src/char/inter.cpp
+++ b/src/char/inter.cpp
@@ -4,14 +4,15 @@
#include <cstring>
#include <fstream>
+#include <vector>
#include "../common/cxxstdio.hpp"
#include "../common/db.hpp"
#include "../common/extract.hpp"
#include "../common/lock.hpp"
-#include "../common/mmo.hpp"
#include "../common/socket.hpp"
#include "../common/timer.hpp"
+#include "../common/utils.hpp"
#include "char.hpp"
#include "int_party.hpp"