From 96cc4f2e7496202c8c278399124f9f85ce3a5ae5 Mon Sep 17 00:00:00 2001 From: shennetsind Date: Fri, 27 Jul 2012 00:11:32 +0000 Subject: Fixed bugreport:309 combos may now stack properly. moved all combo processing out of item bonuses and made it's own processing scheme, which is by far more efficient cpu-wise although it requires a little more memory, instead of checking for combo items whenever a status effect is turned on/off it only checks when equipping/un-equipping a item (and on login). Special Thanks to GreenBox, Kenpachi, Skotlex and Trojal git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16508 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/pc.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/map/pc.h') diff --git a/src/map/pc.h b/src/map/pc.h index 6f2275fa7..269bc65dc 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -454,6 +454,12 @@ struct map_session_data { unsigned int npc_idle_tick; #endif + struct { + struct script_code **bonus;/* the script */ + unsigned short *id;/* array of combo ids */ + unsigned char count; + } combos; + /** * Guarantees your friend request is legit (for bugreport:4629) **/ @@ -909,4 +915,7 @@ void pc_overheat(struct map_session_data *sd, int val); int pc_banding(struct map_session_data *sd, short skill_lv); void pc_itemcd_do(struct map_session_data *sd, bool load); + +int pc_load_combo(struct map_session_data *sd); + #endif /* _PC_H_ */ -- cgit v1.2.3-70-g09d2