diff options
| author | daegaladh <daegaladh@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-07-21 04:08:44 +0000 |
|---|---|---|
| committer | daegaladh <daegaladh@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-07-21 04:08:44 +0000 |
| commit | 576b80efa1c556796c13f195467e0dd1cea5631b (patch) | |
| tree | 38438982c5f54d1666eba94809c2fb6c60518224 /src/map/chat.c | |
| parent | 1dea49c7f44dc9c33f8d204809a830be58a75ba2 (diff) | |
| download | hercules-576b80efa1c556796c13f195467e0dd1cea5631b.tar.gz hercules-576b80efa1c556796c13f195467e0dd1cea5631b.tar.bz2 hercules-576b80efa1c556796c13f195467e0dd1cea5631b.tar.xz hercules-576b80efa1c556796c13f195467e0dd1cea5631b.zip | |
Fixed an old bug in waitingroom where NPCs weren't appearing into their chatrooms.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16461 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/chat.c')
| -rw-r--r-- | src/map/chat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/chat.c b/src/map/chat.c index 9a59950d4..5a0f1123e 100644 --- a/src/map/chat.c +++ b/src/map/chat.c @@ -119,7 +119,7 @@ int chat_joinchat(struct map_session_data* sd, int chatid, const char* pass) nullpo_ret(sd); cd = (struct chat_data*)map_id2bl(chatid); - if( cd == NULL || cd->bl.type != BL_CHAT || cd->bl.m != sd->bl.m || sd->state.vending || sd->state.buyingstore || sd->chatID || cd->users >= cd->limit ) + if( cd == NULL || cd->bl.type != BL_CHAT || cd->bl.m != sd->bl.m || sd->state.vending || sd->state.buyingstore || sd->chatID || ((cd->owner->type == BL_NPC) ? cd->users+1 : cd->users) >= cd->limit ) { clif_joinchatfail(sd,0); return 0; |