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/script.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/script.c')
| -rw-r--r-- | src/map/script.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map/script.c b/src/map/script.c index 15870aaa7..682faa42b 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -16312,6 +16312,7 @@ BUILDIN(progressbar) sd->progressbar.npc_id = st->oid; sd->progressbar.timeout = iTimer->gettick() + second*1000; + sd->state.workinprogress = 3; clif->progressbar(sd, strtol(color, (char **)NULL, 0), second); return true; @@ -16520,9 +16521,10 @@ BUILDIN(setmounting) { TBL_PC* sd; if( (sd = script_rid2sd(st)) == NULL ) return true; - if( sd->sc.option&(OPTION_WUGRIDER|OPTION_RIDING|OPTION_DRAGON|OPTION_MADOGEAR) ) + if( sd->sc.option&(OPTION_WUGRIDER|OPTION_RIDING|OPTION_DRAGON|OPTION_MADOGEAR) ){ + clif->msgtable(sd->fd, 0X78b); script_pushint(st,0);//can't mount with one of these - else { + }else { if( sd->sc.data[SC_ALL_RIDING] ) status_change_end(&sd->bl, SC_ALL_RIDING, INVALID_TIMER); else |