Просмотр исходного кода

Fixed an import issue in mapindex (#2512)

* Fixes #2511.
Thanks to @Daegaladh for his input!
Lemongrass3110 7 лет назад
Родитель
Сommit
caf31521d0
3 измененных файлов с 3 добавлено и 7 удалено
  1. 1 2
      src/common/mapindex.c
  2. 1 1
      src/common/mapindex.h
  3. 1 4
      src/tool/mapcache.c

+ 1 - 2
src/common/mapindex.c

@@ -1,10 +1,9 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 // For more information, see LICENCE in the main folder
 
 
-#include "../config/core.h"
+#include "mmo.h"
 #include "core.h"
 #include "core.h"
 #include "mapindex.h"
 #include "mapindex.h"
-#include "mmo.h"
 #include "showmsg.h"
 #include "showmsg.h"
 #include "strlib.h"
 #include "strlib.h"
 
 

+ 1 - 1
src/common/mapindex.h

@@ -8,7 +8,7 @@
 extern "C" {
 extern "C" {
 #endif
 #endif
 
 
-#include "../config/renewal.h"
+#include "../common/mmo.h"
 
 
 #define MAX_MAPINDEX 2000
 #define MAX_MAPINDEX 2000
 
 

+ 1 - 4
src/tool/mapcache.c

@@ -9,15 +9,12 @@
 #include <unistd.h>
 #include <unistd.h>
 #endif
 #endif
 
 
-#include "../common/cbasetypes.h"
+#include "../common/mmo.h"
 #include "../common/grfio.h"
 #include "../common/grfio.h"
 #include "../common/malloc.h"
 #include "../common/malloc.h"
-#include "../common/mmo.h"
 #include "../common/showmsg.h"
 #include "../common/showmsg.h"
 #include "../common/utils.h"
 #include "../common/utils.h"
 
 
-#include "../config/renewal.h"
-
 #define NO_WATER 1000000
 #define NO_WATER 1000000
 
 
 char grf_list_file[256] = "conf/grf-files.txt";
 char grf_list_file[256] = "conf/grf-files.txt";