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/clif.c | |
| 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/clif.c')
| -rw-r--r-- | src/map/clif.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index c9a8a685c..0bbeb9361 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -9220,8 +9220,7 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) if (sd->sc.option&OPTION_RIDING) clif_status_load(&sd->bl, SI_RIDING, 1); - - if (sd->sc.option&OPTION_WUGRIDER) + else if (sd->sc.option&OPTION_WUGRIDER) clif_status_load(&sd->bl, SI_WUGRIDER, 1); if(sd->status.manner < 0) @@ -9241,12 +9240,11 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) if(merc_is_hom_active(sd->hd)) merc_hom_init_timers(sd->hd); - if (night_flag && map[sd->bl.m].flag.nightenabled) - { + if (night_flag && map[sd->bl.m].flag.nightenabled) { sd->state.night = 1; clif_status_load(&sd->bl, SI_NIGHT, 1); } - + // Notify everyone that this char logged in [Skotlex]. map_foreachpc(clif_friendslist_toggle_sub, sd->status.account_id, sd->status.char_id, 1); |