diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-07-27 00:11:32 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-07-27 00:11:32 +0000 |
| commit | 96cc4f2e7496202c8c278399124f9f85ce3a5ae5 (patch) | |
| tree | 7455cde7f3b96c014e441b58662630910f49ed36 /src/map/pc.h | |
| parent | 679b172c58b43307a8e25ba85bae0d83f8598926 (diff) | |
| download | hercules-96cc4f2e7496202c8c278399124f9f85ce3a5ae5.tar.gz hercules-96cc4f2e7496202c8c278399124f9f85ce3a5ae5.tar.bz2 hercules-96cc4f2e7496202c8c278399124f9f85ce3a5ae5.tar.xz hercules-96cc4f2e7496202c8c278399124f9f85ce3a5ae5.zip | |
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
Diffstat (limited to 'src/map/pc.h')
| -rw-r--r-- | src/map/pc.h | 9 |
1 files changed, 9 insertions, 0 deletions
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_ */ |