Bladeren bron

- Fixed various include lines in the map server (of the type <include "nullpo.h"> -> <include "../common/nullpo.h">)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5985 54d463be-8e91-2dee-dedb-b68131a5f0ec
skotlex 19 jaren geleden
bovenliggende
commit
254d003229
5 gewijzigde bestanden met toevoegingen van 14 en 13 verwijderingen
  1. 1 1
      src/map/charcommand.c
  2. 5 4
      src/map/chrif.c
  3. 1 1
      src/map/irc.c
  4. 1 1
      src/map/itemdb.c
  5. 6 6
      src/map/pet.c

+ 1 - 1
src/map/charcommand.c

@@ -11,6 +11,7 @@
 #include "../common/socket.h"
 #include "../common/timer.h"
 #include "../common/nullpo.h"
+#include "../common/showmsg.h"
 
 #include "log.h"
 #include "clif.h"
@@ -26,7 +27,6 @@
 #include "battle.h"
 #include "charcommand.h"
 #include "atcommand.h"
-#include "showmsg.h"
 
 static char command_symbol = '#';
 

+ 5 - 4
src/map/chrif.c

@@ -17,8 +17,11 @@
 #include <limits.h>
 
 #include "../common/malloc.h"
-#include "socket.h"
-#include "timer.h"
+#include "../common/socket.h"
+#include "../common/timer.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+
 #include "map.h"
 #include "battle.h"
 #include "chrif.h"
@@ -27,8 +30,6 @@
 #include "npc.h"
 #include "pc.h"
 #include "status.h"
-#include "nullpo.h"
-#include "showmsg.h"
 #ifndef TXT_ONLY
 #include "charsave.h"
 #endif

+ 1 - 1
src/map/irc.c

@@ -32,8 +32,8 @@ typedef int socklen_t;
 #include "../common/mmo.h"
 #include "../common/showmsg.h"
 #include "../common/version.h"
+#include "../common/nullpo.h"
 
-#include "nullpo.h"
 #include "map.h"
 #include "pc.h"
 #include "irc.h"

+ 1 - 1
src/map/itemdb.c

@@ -8,8 +8,8 @@
 #include "../common/nullpo.h"
 #include "../common/malloc.h"
 #include "../common/showmsg.h"
+#include "../common/grfio.h"
 #include "map.h"
-#include "grfio.h"
 #include "battle.h"
 #include "itemdb.h"
 #include "script.h"

+ 6 - 6
src/map/pet.c

@@ -5,11 +5,12 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "db.h"
-#include "timer.h"
-#include "socket.h"
-#include "nullpo.h"
-#include "malloc.h"
+#include "../common/db.h"
+#include "../common/timer.h"
+#include "../common/nullpo.h"
+#include "../common/malloc.h"
+#include "../common/showmsg.h"
+
 #include "pc.h"
 #include "status.h"
 #include "map.h"
@@ -23,7 +24,6 @@
 #include "npc.h"
 #include "script.h"
 #include "skill.h"
-#include "showmsg.h"
 
 #define MIN_PETTHINKTIME 100