- Changed the status_change structure to use dynamic rather than static memory to hold the individual status changes, this should have a noticeable impact on the server's memory consumption.

- Had to add a few 'ugly' flags to status_change since now you can't track SC related information while said SC is not active (happens only for Storm Gust, Joint Beat and Magic Power).
- Since I am unable to fully test, watch out for any bugs~


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

1 files changed, 9 insertions, 4 deletions

diff --git a/src/map/map.h b/src/map/map.h
index 6f3b27c2b..dcc2412d1 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -374,12 +374,17 @@ struct status_change_entry {
 };
 
 struct status_change {
-	struct status_change_entry data[SC_MAX];
-	short count;
+	unsigned int option;// effect state
+	unsigned int opt3;// skill state
 	unsigned short opt1;// body state
 	unsigned short opt2;// health state
-	unsigned int opt3;
-	unsigned int option;// effect state
+	unsigned char count;
+	//TODO: See if it is possible to implement the following SC's without requiring extra parameters while the SC is inactive.
+	unsigned char jb_flag; //Joint Beat type flag
+	unsigned short mp_matk_min, mp_matk_max; //Previous matk min/max for ground spells (Amplify magic power)
+	int sg_id; //ID of the previous Storm gust that hit you
+	unsigned char sg_counter; //Storm gust counter (previous hits from storm gust)
+	struct status_change_entry *data[SC_MAX];
 };
 
 struct s_vending {