diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-15 14:15:04 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-15 14:15:04 +0000 |
| commit | 422a0536cfc1074f534cf31885b18807cdff6d80 (patch) | |
| tree | 742a66a28cd4ea0b038dd09923bb15f458d35dfc /src | |
| parent | 1a8c1081563174cdea5630ad5bc992405cd86e7d (diff) | |
| download | hercules-422a0536cfc1074f534cf31885b18807cdff6d80.tar.gz hercules-422a0536cfc1074f534cf31885b18807cdff6d80.tar.bz2 hercules-422a0536cfc1074f534cf31885b18807cdff6d80.tar.xz hercules-422a0536cfc1074f534cf31885b18807cdff6d80.zip | |
- Added SC_BLADESTOP to the switch listing in status_change_start
- Characters in vending are now always considered "idle" if the idle_no_share setting is active.
- Corrected 10 Geminis spawning in Lhz1 rather than 2.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6595 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/clif.c | 8 | ||||
| -rw-r--r-- | src/map/party.c | 2 | ||||
| -rw-r--r-- | src/map/status.c | 1 |
3 files changed, 2 insertions, 9 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index d46f52397..fa243eb1e 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -763,14 +763,6 @@ int clif_clearchar_delay(unsigned int tick, struct block_list *bl, int type) { *------------------------------------------
*/
int clif_clearchar_id(int id, int type, int fd) {
- /*unsigned char buf[16];
-
- WBUFW(buf,0) = 0x80;
- WBUFL(buf,2) = id;
- WBUFB(buf,6) = type;
- WFIFOHEAD(fd, packet_len_table[0x80]);
- memcpy(WFIFOP(fd,0), buf, 7);
- WFIFOSET(fd, packet_len_table[0x80]);*/
WFIFOHEAD(fd, packet_len_table[0x80]);
WFIFOW(fd,0) = 0x80;
diff --git a/src/map/party.c b/src/map/party.c index 8ee9f715d..7c72d23ad 100644 --- a/src/map/party.c +++ b/src/map/party.c @@ -669,7 +669,7 @@ int party_exp_share(struct party *p,int map,unsigned int base_exp,unsigned int j for (i = c = 0; i < MAX_PARTY; i++)
if ((sd[c] = p->member[i].sd)!=NULL && sd[c]->bl.m == map && !pc_isdead(sd[c])) {
- if (battle_config.idle_no_share && (sd[c]->chatID || (sd[c]->idletime < (last_tick - battle_config.idle_no_share))))
+ if (battle_config.idle_no_share && (sd[c]->chatID || sd[c]->vender_id || (sd[c]->idletime < (last_tick - battle_config.idle_no_share))))
continue;
c++;
}
diff --git a/src/map/status.c b/src/map/status.c index db6adb7b5..0c4516bc7 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -4633,6 +4633,7 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val case SC_SLEEP:
case SC_SMA:
case SC_WARM:
+ case SC_BLADESTOP:
break;
// gs_something1 [Vicious]
case SC_MADNESSCANCEL:
|