diff options
| author | Euphy <euphy@rathena.org> | 2013-06-20 22:46:37 -0400 |
|---|---|---|
| committer | Euphy <euphy@rathena.org> | 2013-06-20 22:46:37 -0400 |
| commit | 093193bd26b87f6afc876fd96b46271bd4e2ed81 (patch) | |
| tree | e52e626bc8edc9ea68eb48ad2e8ec517ee997d33 /src/map/script.c | |
| parent | 86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528 (diff) | |
| download | hercules-093193bd26b87f6afc876fd96b46271bd4e2ed81.tar.gz hercules-093193bd26b87f6afc876fd96b46271bd4e2ed81.tar.bz2 hercules-093193bd26b87f6afc876fd96b46271bd4e2ed81.tar.xz hercules-093193bd26b87f6afc876fd96b46271bd4e2ed81.zip | |
Merged conflicts.
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/map/script.c b/src/map/script.c index 4876111ef..f65c0c21c 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -16310,10 +16310,7 @@ BUILDIN(progressbar) sd->progressbar.npc_id = st->oid; sd->progressbar.timeout = iTimer->gettick() + second*1000; -<<<<<<< HEAD -======= sd->state.workinprogress = 3; ->>>>>>> upstream/master clif->progressbar(sd, strtol(color, (char **)NULL, 0), second); return true; |