Removed the map.h<->status.h cyclic dependency. Relies on the fact by that preprocessor definitions don't need to be expanded immediately (or some other obscure reason why the thing even compiles :D)

This allowed me to also remove the annoying/memory-wasting MAX_STATUSCHANGE define.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10442 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 3 insertions, 2 deletions

diff --git a/src/map/map.h b/src/map/map.h
index 235eb7dfd..a2bf8d455 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -10,6 +10,7 @@
 #include "../common/db.h"
 
 #include "itemdb.h" // MAX_ITEMGROUP
+#include "status.h" // SC_MAX
 
 //Uncomment to enable the Cell Stack Limit mod.
 //It's only config is the battle_config cell_stack_limit.
@@ -33,7 +34,7 @@
 #define LIFETIME_FLOORITEM 60
 #define DAMAGELOG_SIZE 30
 #define LOOTITEM_SIZE 10
-#define MAX_STATUSCHANGE 300
+//#define MAX_STATUSCHANGE 300
 //Quick defines to know which are the min-max common ailments. [Skotlex]
 //Because of the way the headers are included.. these must be replaced for actual values.
 //Remember to update as needed! Min is SC_STONE and max is SC_DPOISON currently.
@@ -384,7 +385,7 @@ struct status_change_entry {
 };
 
 struct status_change {
-	struct status_change_entry data[MAX_STATUSCHANGE];
+	struct status_change_entry data[SC_MAX];
 	short count;
 	unsigned short opt1,opt2;
 	unsigned int opt3, option; //Note that older packet versions use short here.