Split net/ from mmo/

36 files changed, 89 insertions, 52 deletions

diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp
index 2f08627..733050c 100644
--- a/src/map/atcommand.cpp
+++ b/src/map/atcommand.cpp
@@ -42,14 +42,15 @@
 #include "../io/read.hpp"
 #include "../io/write.hpp"
 
+#include "../net/socket.hpp"
+#include "../net/timer.hpp"
+
 #include "../mmo/config_parse.hpp"
 #include "../mmo/core.hpp"
 #include "../mmo/extract.hpp"
 #include "../mmo/human_time_diff.hpp"
 #include "../mmo/ids.hpp"
 #include "../mmo/mmo.hpp"
-#include "../mmo/socket.hpp"
-#include "../mmo/timer.hpp"
 #include "../mmo/utils.hpp"
 #include "../mmo/version.hpp"
 
diff --git a/src/map/atcommand.hpp b/src/map/atcommand.hpp
index 0a24163..a2aaf5b 100644
--- a/src/map/atcommand.hpp
+++ b/src/map/atcommand.hpp
@@ -25,8 +25,11 @@
 
 # include "../strings/fwd.hpp"
 
+# include "../generic/fwd.hpp"
+
+# include "../net/fwd.hpp"
+
 # include "../mmo/fwd.hpp"
-# include "../mmo/dumb_ptr.hpp"
 
 bool is_atcommand(Session *s, dumb_ptr<map_session_data> sd,
         ZString message, GmLevel gmlvl);
diff --git a/src/map/battle.hpp b/src/map/battle.hpp
index 6e73e70..b448073 100644
--- a/src/map/battle.hpp
+++ b/src/map/battle.hpp
@@ -27,8 +27,9 @@
 
 # include "../strings/fwd.hpp"
 
-# include "../mmo/dumb_ptr.hpp"
-# include "../mmo/timer.t.hpp"
+# include "../generic/fwd.hpp"
+
+# include "../net/timer.t.hpp"
 
 # include "magic-interpreter.t.hpp"
 # include "map.t.hpp"
diff --git a/src/map/chrif.cpp b/src/map/chrif.cpp
index 50c62a8..b5c5bf6 100644
--- a/src/map/chrif.cpp
+++ b/src/map/chrif.cpp
@@ -28,11 +28,12 @@
 
 #include "../io/cxxstdio.hpp"
 
+#include "../net/ip.hpp"
+#include "../net/socket.hpp"
+#include "../net/timer.hpp"
+
 #include "../mmo/human_time_diff.hpp"
-#include "../mmo/ip.hpp"
 #include "../mmo/mmo.hpp"
-#include "../mmo/socket.hpp"
-#include "../mmo/timer.hpp"
 #include "../mmo/utils.hpp"
 
 #include "battle.hpp"
diff --git a/src/map/chrif.hpp b/src/map/chrif.hpp
index 7ac16e5..321b3bd 100644
--- a/src/map/chrif.hpp
+++ b/src/map/chrif.hpp
@@ -25,8 +25,11 @@
 
 # include "../strings/fwd.hpp"
 
+# include "../generic/fwd.hpp"
+
+# include "../net/fwd.hpp"
+
 # include "../mmo/fwd.hpp"
-# include "../mmo/dumb_ptr.hpp"
 
 void chrif_setuserid(AccountName);
 void chrif_setpasswd(AccountPass);
diff --git a/src/map/clif.cpp b/src/map/clif.cpp
index 0a6406b..ce328f6 100644
--- a/src/map/clif.cpp
+++ b/src/map/clif.cpp
@@ -38,10 +38,11 @@
 #include "../io/cxxstdio.hpp"
 #include "../io/write.hpp"
 
-#include "../mmo/ip.hpp"
+#include "../net/ip.hpp"
+#include "../net/socket.hpp"
+#include "../net/timer.hpp"
+
 #include "../mmo/md5more.hpp"
-#include "../mmo/socket.hpp"
-#include "../mmo/timer.hpp"
 #include "../mmo/utils.hpp"
 #include "../mmo/version.hpp"
 
diff --git a/src/map/clif.hpp b/src/map/clif.hpp
index 19d5fd3..b2a5747 100644
--- a/src/map/clif.hpp
+++ b/src/map/clif.hpp
@@ -29,10 +29,12 @@
 
 # include "../strings/fwd.hpp"
 
+# include "../generic/fwd.hpp"
+
+# include "../net/timer.t.hpp"
+
 # include "../mmo/fwd.hpp"
-# include "../mmo/dumb_ptr.hpp"
 # include "../mmo/mmo.hpp"
-# include "../mmo/timer.t.hpp"
 
 # include "battle.t.hpp"
 # include "map.t.hpp"
diff --git a/src/map/intif.cpp b/src/map/intif.cpp
index d0b1ea0..57c6048 100644
--- a/src/map/intif.cpp
+++ b/src/map/intif.cpp
@@ -29,8 +29,9 @@
 
 #include "../io/cxxstdio.hpp"
 
+#include "../net/socket.hpp"
+
 #include "../mmo/mmo.hpp"
-#include "../mmo/socket.hpp"
 
 #include "battle.hpp"
 #include "chrif.hpp"
diff --git a/src/map/intif.hpp b/src/map/intif.hpp
index e05d00f..c60e3c1 100644
--- a/src/map/intif.hpp
+++ b/src/map/intif.hpp
@@ -25,8 +25,11 @@
 
 # include "../strings/fwd.hpp"
 
+# include "../generic/fwd.hpp"
+
+# include "../net/fwd.hpp"
+
 # include "../mmo/fwd.hpp"
-# include "../mmo/dumb_ptr.hpp"
 
 int intif_parse(Session *);
 
diff --git a/src/map/magic-expr.cpp b/src/map/magic-expr.cpp
index ee422c1..2ae9b20 100644
--- a/src/map/magic-expr.cpp
+++ b/src/map/magic-expr.cpp
@@ -29,12 +29,11 @@
 #include "../strings/vstring.hpp"
 #include "../strings/literal.hpp"
 
+#include "../generic/dumb_ptr.hpp"
 #include "../generic/random.hpp"
 
 #include "../io/cxxstdio.hpp"
 
-#include "../mmo/dumb_ptr.hpp"
-
 #include "battle.hpp"
 #include "itemdb.hpp"
 #include "magic-expr-eval.hpp"
diff --git a/src/map/magic-expr.hpp b/src/map/magic-expr.hpp
index 7276fd2..1c4d00e 100644
--- a/src/map/magic-expr.hpp
+++ b/src/map/magic-expr.hpp
@@ -22,7 +22,7 @@
 
 # include "fwd.hpp"
 
-# include "../mmo/dumb_ptr.hpp"
+# include "../generic/fwd.hpp"
 
 # include "../range/fwd.hpp"
 
diff --git a/src/map/magic-interpreter-base.cpp b/src/map/magic-interpreter-base.cpp
index baec6fb..b2ed0a5 100644
--- a/src/map/magic-interpreter-base.cpp
+++ b/src/map/magic-interpreter-base.cpp
@@ -26,7 +26,7 @@
 
 #include "../io/cxxstdio.hpp"
 
-#include "../mmo/timer.hpp"
+#include "../net/timer.hpp"
 
 #include "magic.hpp"
 #include "magic-expr.hpp"
diff --git a/src/map/magic-interpreter-base.hpp b/src/map/magic-interpreter-base.hpp
index 1baefc6..7d75049 100644
--- a/src/map/magic-interpreter-base.hpp
+++ b/src/map/magic-interpreter-base.hpp
@@ -24,7 +24,9 @@
 
 # include "../strings/fwd.hpp"
 
-# include "../mmo/dumb_ptr.hpp"
+# include "../generic/fwd.hpp"
+
+# include "../mmo/fwd.hpp"
 
 extern magic_conf_t magic_conf; /* Global magic conf */
 extern env_t magic_default_env; /* Fake default environment */
diff --git a/src/map/magic-interpreter.hpp b/src/map/magic-interpreter.hpp
index 8861e92..cf0991e 100644
--- a/src/map/magic-interpreter.hpp
+++ b/src/map/magic-interpreter.hpp
@@ -31,9 +31,11 @@
 # include "../strings/fwd.hpp"
 # include "../strings/rstring.hpp"
 
-# include "../mmo/dumb_ptr.hpp"
+# include "../generic/fwd.hpp"
+
+# include "../net/timer.t.hpp"
+
 # include "../mmo/ids.hpp"
-# include "../mmo/timer.t.hpp"
 # include "../mmo/utils.hpp"
 
 # include "map.hpp"
diff --git a/src/map/magic-stmt.cpp b/src/map/magic-stmt.cpp
index 98cdb7e..f87eabf 100644
--- a/src/map/magic-stmt.cpp
+++ b/src/map/magic-stmt.cpp
@@ -30,7 +30,7 @@
 
 #include "../io/cxxstdio.hpp"
 
-#include "../mmo/timer.hpp"
+#include "../net/timer.hpp"
 
 #include "battle.hpp"
 #include "clif.hpp"
diff --git a/src/map/magic-stmt.hpp b/src/map/magic-stmt.hpp
index 08c2b28..97fdf1f 100644
--- a/src/map/magic-stmt.hpp
+++ b/src/map/magic-stmt.hpp
@@ -24,7 +24,9 @@
 
 # include "../range/fwd.hpp"
 
-# include "../mmo/dumb_ptr.hpp"
+# include "../strings/zstring.hpp"
+
+# include "../generic/fwd.hpp"
 
 # include "skill.t.hpp"
 
diff --git a/src/map/magic-v2.cpp b/src/map/magic-v2.cpp
index 510c619..1e2a330 100644
--- a/src/map/magic-v2.cpp
+++ b/src/map/magic-v2.cpp
@@ -27,13 +27,13 @@
 #include "../strings/rstring.hpp"
 #include "../strings/literal.hpp"
 
+#include "../generic/dumb_ptr.hpp"
+
 #include "../io/cxxstdio.hpp"
 #include "../io/line.hpp"
 
 #include "../sexpr/parser.hpp"
 
-#include "../mmo/dumb_ptr.hpp"
-
 #include "itemdb.hpp"
 #include "magic-expr.hpp"
 #include "magic-interpreter.hpp"
diff --git a/src/map/magic.cpp b/src/map/magic.cpp
index 88ee1f1..b502d3e 100644
--- a/src/map/magic.cpp
+++ b/src/map/magic.cpp
@@ -24,9 +24,9 @@
 
 #include "../strings/xstring.hpp"
 
-#include "../io/cxxstdio.hpp"
+#include "../generic/dumb_ptr.hpp"
 
-#include "../mmo/dumb_ptr.hpp"
+#include "../io/cxxstdio.hpp"
 
 #include "magic-expr.hpp"
 #include "magic-interpreter.hpp"
diff --git a/src/map/magic.hpp b/src/map/magic.hpp
index cd0ff99..e54661b 100644
--- a/src/map/magic.hpp
+++ b/src/map/magic.hpp
@@ -24,7 +24,7 @@
 
 # include "../strings/fwd.hpp"
 
-# include "../mmo/dumb_ptr.hpp"
+# include "../generic/fwd.hpp"
 
 # include "map.t.hpp"
 # include "skill.t.hpp"
diff --git a/src/map/map.cpp b/src/map/map.cpp
index b845abc..dde617a 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -49,11 +49,12 @@
 #include "../io/tty.hpp"
 #include "../io/write.hpp"
 
+#include "../net/socket.hpp"
+#include "../net/timer.hpp"
+
 #include "../mmo/config_parse.hpp"
 #include "../mmo/core.hpp"
 #include "../mmo/extract.hpp"
-#include "../mmo/socket.hpp"
-#include "../mmo/timer.hpp"
 #include "../mmo/utils.hpp"
 #include "../mmo/version.hpp"
 
diff --git a/src/map/map.hpp b/src/map/map.hpp
index 2bc8e45..78d12f8 100644
--- a/src/map/map.hpp
+++ b/src/map/map.hpp
@@ -37,10 +37,12 @@
 # include "../strings/vstring.hpp"
 
 # include "../generic/db.hpp"
+# include "../generic/dumb_ptr.hpp"
 # include "../generic/matrix.hpp"
 
-# include "../mmo/socket.hpp"
-# include "../mmo/timer.t.hpp"
+# include "../net/socket.hpp"
+# include "../net/timer.t.hpp"
+
 # include "../mmo/utils.hpp"
 
 # include "battle.t.hpp"
diff --git a/src/map/mob.cpp b/src/map/mob.cpp
index 923b369..731448b 100644
--- a/src/map/mob.cpp
+++ b/src/map/mob.cpp
@@ -38,10 +38,11 @@
 #include "../io/cxxstdio.hpp"
 #include "../io/read.hpp"
 
+#include "../net/socket.hpp"
+#include "../net/timer.hpp"
+
 #include "../mmo/config_parse.hpp"
 #include "../mmo/extract.hpp"
-#include "../mmo/socket.hpp"
-#include "../mmo/timer.hpp"
 
 #include "battle.hpp"
 #include "clif.hpp"
diff --git a/src/map/mob.hpp b/src/map/mob.hpp
index 48d7df5..8860ab5 100644
--- a/src/map/mob.hpp
+++ b/src/map/mob.hpp
@@ -25,10 +25,11 @@
 
 # include "mob.t.hpp"
 
-# include "../generic/random.t.hpp"
+# include "../generic/fwd.hpp"
 # include "../generic/enum.hpp"
+# include "../generic/random.t.hpp"
 
-# include "../mmo/timer.t.hpp"
+# include "../net/timer.t.hpp"
 
 # include "battle.t.hpp"
 # include "clif.t.hpp"
diff --git a/src/map/npc.cpp b/src/map/npc.cpp
index 32711d0..aee3d03 100644
--- a/src/map/npc.cpp
+++ b/src/map/npc.cpp
@@ -40,9 +40,10 @@
 #include "../io/cxxstdio.hpp"
 #include "../io/read.hpp"
 
+#include "../net/timer.hpp"
+
 #include "../mmo/config_parse.hpp"
 #include "../mmo/extract.hpp"
-#include "../mmo/timer.hpp"
 #include "../mmo/utils.hpp"
 
 #include "battle.hpp"
diff --git a/src/map/npc.hpp b/src/map/npc.hpp
index d8930c8..011ea50 100644
--- a/src/map/npc.hpp
+++ b/src/map/npc.hpp
@@ -27,7 +27,9 @@
 
 # include "../strings/fwd.hpp"
 
-# include "../mmo/timer.t.hpp"
+# include "../generic/fwd.hpp"
+
+# include "../net/timer.t.hpp"
 
 # include "map.hpp"
 
diff --git a/src/map/party.cpp b/src/map/party.cpp
index 66dc2fa..f40b991 100644
--- a/src/map/party.cpp
+++ b/src/map/party.cpp
@@ -29,9 +29,10 @@
 
 #include "../io/cxxstdio.hpp"
 
+#include "../net/timer.hpp"
+
 #include "../mmo/ids.hpp"
 #include "../mmo/mmo.hpp"
-#include "../mmo/timer.hpp"
 
 #include "battle.hpp"
 #include "clif.hpp"
diff --git a/src/map/party.hpp b/src/map/party.hpp
index 4eaffb0..4670aee 100644
--- a/src/map/party.hpp
+++ b/src/map/party.hpp
@@ -27,8 +27,9 @@
 
 # include "../strings/fwd.hpp"
 
+# include "../generic/fwd.hpp"
+
 # include "../mmo/fwd.hpp"
-# include "../mmo/dumb_ptr.hpp"
 
 void do_init_party(void);
 struct party *party_search(PartyId party_id);
diff --git a/src/map/pc.cpp b/src/map/pc.cpp
index c9e67ea..9a1493f 100644
--- a/src/map/pc.cpp
+++ b/src/map/pc.cpp
@@ -39,8 +39,9 @@
 #include "../io/cxxstdio.hpp"
 #include "../io/read.hpp"
 
-#include "../mmo/socket.hpp"
-#include "../mmo/timer.hpp"
+#include "../net/socket.hpp"
+#include "../net/timer.hpp"
+
 #include "../mmo/utils.hpp"
 
 #include "atcommand.hpp"
diff --git a/src/map/pc.hpp b/src/map/pc.hpp
index 412953d..900ce97 100644
--- a/src/map/pc.hpp
+++ b/src/map/pc.hpp
@@ -27,6 +27,8 @@
 
 # include "../strings/fwd.hpp"
 
+# include "../generic/dumb_ptr.hpp"
+
 # include "../mmo/utils.hpp"
 
 # include "clif.t.hpp"
diff --git a/src/map/script.cpp b/src/map/script.cpp
index 158a832..9cc17aa 100644
--- a/src/map/script.cpp
+++ b/src/map/script.cpp
@@ -48,11 +48,12 @@
 #include "../io/read.hpp"
 #include "../io/write.hpp"
 
+#include "../net/socket.hpp"
+#include "../net/timer.hpp"
+
 #include "../mmo/core.hpp"
 #include "../mmo/extract.hpp"
 #include "../mmo/human_time_diff.hpp"
-#include "../mmo/socket.hpp"
-#include "../mmo/timer.hpp"
 #include "../mmo/utils.hpp"
 
 #include "atcommand.hpp"
diff --git a/src/map/script.hpp b/src/map/script.hpp
index 11a9289..d42da2c 100644
--- a/src/map/script.hpp
+++ b/src/map/script.hpp
@@ -32,8 +32,7 @@
 # include "../strings/zstring.hpp"
 
 # include "../generic/db.hpp"
-
-# include "../mmo/dumb_ptr.hpp"
+# include "../generic/dumb_ptr.hpp"
 
 # include "map.t.hpp"
 
diff --git a/src/map/skill.cpp b/src/map/skill.cpp
index 8e67065..ad8e2e7 100644
--- a/src/map/skill.cpp
+++ b/src/map/skill.cpp
@@ -41,8 +41,9 @@
 #include "../io/cxxstdio.hpp"
 #include "../io/read.hpp"
 
+#include "../net/timer.hpp"
+
 #include "../mmo/extract.hpp"
-#include "../mmo/timer.hpp"
 
 #include "battle.hpp"
 #include "clif.hpp"
diff --git a/src/map/skill.hpp b/src/map/skill.hpp
index 3c162d5..0e566c6 100644
--- a/src/map/skill.hpp
+++ b/src/map/skill.hpp
@@ -30,6 +30,7 @@
 # include "../strings/rstring.hpp"
 # include "../strings/literal.hpp"
 
+# include "../generic/fwd.hpp"
 # include "../generic/array.hpp"
 
 # include "map.hpp"
diff --git a/src/map/storage.hpp b/src/map/storage.hpp
index 4101893..4de931f 100644
--- a/src/map/storage.hpp
+++ b/src/map/storage.hpp
@@ -23,8 +23,9 @@
 
 # include "fwd.hpp"
 
+# include "../generic/fwd.hpp"
+
 # include "../mmo/fwd.hpp"
-# include "../mmo/dumb_ptr.hpp"
 
 int storage_storageopen(dumb_ptr<map_session_data> sd);
 int storage_storageadd(dumb_ptr<map_session_data> sd, int index, int amount);
diff --git a/src/map/tmw.hpp b/src/map/tmw.hpp
index 14bf8cc..dae6e69 100644
--- a/src/map/tmw.hpp
+++ b/src/map/tmw.hpp
@@ -24,7 +24,7 @@
 
 # include "../strings/fwd.hpp"
 
-# include "../mmo/dumb_ptr.hpp"
+# include "../generic/fwd.hpp"
 
 int tmw_CheckChatSpam(dumb_ptr<map_session_data> sd, XString message);
 void tmw_GmHackMsg(ZString line);
diff --git a/src/map/trade.hpp b/src/map/trade.hpp
index 1514999..9d542a4 100644
--- a/src/map/trade.hpp
+++ b/src/map/trade.hpp
@@ -23,7 +23,7 @@
 
 # include "fwd.hpp"
 
-# include "../mmo/dumb_ptr.hpp"
+# include "../generic/fwd.hpp"
 
 void trade_traderequest(dumb_ptr<map_session_data> sd, BlockId target_id);
 void trade_tradeack(dumb_ptr<map_session_data> sd, int type);