diff options
| author | Emistry <Equinox1991@gmail.com> | 2015-09-06 06:50:25 +0800 |
|---|---|---|
| committer | Emistry <Equinox1991@gmail.com> | 2015-09-06 06:50:25 +0800 |
| commit | 5fa5d5bae9c1b9fd70a23e072853bb2f5ca733e5 (patch) | |
| tree | e133a4ef06b5fa55f166f7500ef805b9c405e343 /src/map | |
| parent | c3ce0fb9b04d4c51d632c21f24f7a348c2681bf2 (diff) | |
| download | hercules-5fa5d5bae9c1b9fd70a23e072853bb2f5ca733e5.tar.gz hercules-5fa5d5bae9c1b9fd70a23e072853bb2f5ca733e5.tar.bz2 hercules-5fa5d5bae9c1b9fd70a23e072853bb2f5ca733e5.tar.xz hercules-5fa5d5bae9c1b9fd70a23e072853bb2f5ca733e5.zip | |
Revert "Revert "Updated getwaitingroomstate() script command.""
This reverts commit c3ce0fb9b04d4c51d632c21f24f7a348c2681bf2.
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/script.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/map/script.c b/src/map/script.c index 23cf034b8..e134730da 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -11420,6 +11420,10 @@ BUILDIN(disablewaitingroomevent) { /// <type>=16 : the name of the waiting room event /// <type>=32 : if the waiting room is full /// <type>=33 : if there are enough users to trigger the event +/// -- Custom Added +/// <type>=34 : minimum player of waiting room +/// <type>=35 : maximum player of waiting room +/// <type>=36 : minimum zeny required /// /// getwaitingroomstate(<type>,"<npc_name>") -> <info> /// getwaitingroomstate(<type>) -> <info> @@ -11440,7 +11444,13 @@ BUILDIN(getwaitingroomstate) { } switch(type) { - case 0: script_pushint(st, cd->users); break; + case 0: + for (int i = 0; i < cd->users; i++) { + struct map_session_data *sd = cd->usersd[i]; + mapreg->setreg(reference_uid(script->add_str("$@chatmembers"), i), sd->bl.id); + } + script_pushint(st, cd->users); + break; case 1: script_pushint(st, cd->limit); break; case 2: script_pushint(st, cd->trigger&0x7f); break; case 3: script_pushint(st, ((cd->trigger&0x80)!=0)); break; @@ -11449,6 +11459,10 @@ BUILDIN(getwaitingroomstate) { case 16: script_pushstrcopy(st, cd->npc_event);break; case 32: script_pushint(st, (cd->users >= cd->limit)); break; case 33: script_pushint(st, (cd->users >= cd->trigger)); break; + + case 34: script_pushint(st, cd->minLvl); break; + case 35: script_pushint(st, cd->maxLvl); break; + case 36: script_pushint(st, cd->zeny); break; default: script_pushint(st, -1); break; } return true; |