diff options
| author | shennetsind <ind@henn.et> | 2014-02-02 16:50:03 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2014-02-02 16:50:03 -0200 |
| commit | 00ef66fb9261a50e6761cf77c11e7f468494c95f (patch) | |
| tree | c1bc879e76ecaaf619366d6392c13a72bb5640b9 /src/map/pc.h | |
| parent | d33469689ea8e671fa0d525d54bce6932dfe9107 (diff) | |
| download | hercules-00ef66fb9261a50e6761cf77c11e7f468494c95f.tar.gz hercules-00ef66fb9261a50e6761cf77c11e7f468494c95f.tar.bz2 hercules-00ef66fb9261a50e6761cf77c11e7f468494c95f.tar.xz hercules-00ef66fb9261a50e6761cf77c11e7f468494c95f.zip | |
Fixed item combo bypassing disabled item restrictions
Special Thanks to Mhalicot!
Also improves the overall memory usage of the item combo feature
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/pc.h')
| -rw-r--r-- | src/map/pc.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/map/pc.h b/src/map/pc.h index 03b3ddca0..f106631e7 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -116,6 +116,12 @@ enum npc_timeout_type { NPCT_MENU = 1, NPCT_WAIT = 2, }; + +struct pc_combos { + struct script_code *bonus;/* the script of the combo */ + unsigned short id;/* this combo id */ +}; + struct map_session_data { struct block_list bl; struct unit_data ud; @@ -468,12 +474,9 @@ struct map_session_data { enum npc_timeout_type npc_idle_type; #endif - struct { - struct script_code **bonus;/* the script */ - unsigned short *id;/* array of combo ids */ - unsigned char count; - } combos; - + struct pc_combos *combos; + unsigned char combo_count; + /** * Guarantees your friend request is legit (for bugreport:4629) **/ |