diff options
| author | shennetsind <ind@henn.et> | 2013-06-19 08:47:00 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-06-19 08:47:00 -0300 |
| commit | 75c34fa8b87126aaf2b998ef429efe253ce5d105 (patch) | |
| tree | 8e0d1ccd07905b7c6212ef68e2d270b5edba9d83 /src/map/clif.c | |
| parent | 1edc31980be653e6482e4920862ac5d6ab0dd916 (diff) | |
| parent | bd95eccf047bda9d72abcea0724ad34b31131ab0 (diff) | |
| download | hercules-75c34fa8b87126aaf2b998ef429efe253ce5d105.tar.gz hercules-75c34fa8b87126aaf2b998ef429efe253ce5d105.tar.bz2 hercules-75c34fa8b87126aaf2b998ef429efe253ce5d105.tar.xz hercules-75c34fa8b87126aaf2b998ef429efe253ce5d105.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 0c2d16a4d..840aad1f4 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -5964,12 +5964,13 @@ void clif_wis_message(int fd, const char* nick, const char* mes, int mes_len) safestrncpy((char*)WFIFOP(fd,28), mes, mes_len); WFIFOSET(fd,WFIFOW(fd,2)); #else + struct map_session_data *ssd = iMap->nick2sd(nick); + WFIFOHEAD(fd, mes_len + NAME_LENGTH + 8); WFIFOW(fd,0) = 0x97; WFIFOW(fd,2) = mes_len + NAME_LENGTH + 8; safestrncpy((char*)WFIFOP(fd,4), nick, NAME_LENGTH); - WFIFOL(fd,28) = 0; // isAdmin; if nonzero, also displays text above char - // TODO: WFIFOL(fd,28) = pc->get_group_level(ssd); + WFIFOL(fd,28) = (pc->get_group_level(ssd) == 99) ? 1 : 0; // isAdmin; if nonzero, also displays text above char safestrncpy((char*)WFIFOP(fd,32), mes, mes_len); WFIFOSET(fd,WFIFOW(fd,2)); #endif @@ -9756,7 +9757,7 @@ void clif_parse_progressbar(int fd, struct map_session_data * sd) if( iTimer->gettick() < sd->progressbar.timeout && sd->st ) sd->st->state = END; - sd->progressbar.npc_id = sd->progressbar.timeout = 0; + sd->state.workinprogress = sd->progressbar.npc_id = sd->progressbar.timeout = 0; npc_scriptcont(sd, npc_id, false); } @@ -9776,8 +9777,8 @@ void clif_parse_WalkToXY(int fd, struct map_session_data *sd) if (sd->sc.opt1 && ( sd->sc.opt1 == OPT1_STONEWAIT || sd->sc.opt1 == OPT1_BURNING )) ; //You CAN walk on this OPT1 value. - else if( sd->progressbar.npc_id ) - clif->progressbar_abort(sd); + /*else if( sd->progressbar.npc_id ) + clif->progressbar_abort(sd);*/ else if (pc_cant_act(sd)) return; @@ -10572,7 +10573,7 @@ void clif_parse_DropItem(int fd, struct map_session_data *sd) if (pc_isdead(sd)) break; - if ( pc_cant_act2(sd) ) + if ( pc_cant_act2(sd) || sd->state.vending ) break; if (sd->sc.count && ( @@ -10794,7 +10795,7 @@ void clif_parse_NpcClicked(int fd,struct map_session_data *sd) #endif return; } - if ( pc_cant_act2(sd) || !(bl = iMap->id2bl(RFIFOL(fd,2))) ) + if ( pc_cant_act2(sd) || !(bl = iMap->id2bl(RFIFOL(fd,2))) || sd->state.vending ) return; switch (bl->type) { |