diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-05 17:09:02 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-05 17:09:02 +0000 |
| commit | be41590cac32e25a7bbee9967e31855b037b4463 (patch) | |
| tree | 347cd33710e92f9f4e56eccc91726f1ce7f14360 /src | |
| parent | 288490094a7fe9167747dc78d416940759a31197 (diff) | |
| download | hercules-be41590cac32e25a7bbee9967e31855b037b4463.tar.gz hercules-be41590cac32e25a7bbee9967e31855b037b4463.tar.bz2 hercules-be41590cac32e25a7bbee9967e31855b037b4463.tar.xz hercules-be41590cac32e25a7bbee9967e31855b037b4463.zip | |
- Fixed sc data load failing when using charsave_method: 1
- Fixed the interserver link reserve size being 8 times instead of 1/8th the default size. Changed it to be 1/4th as well.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9411 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/socket.c | 4 | ||||
| -rw-r--r-- | src/map/pc.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/common/socket.c b/src/common/socket.c index 4651f1dac..bedad4ed0 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -709,8 +709,8 @@ int WFIFOSET(int fd,int len) s->wdata_size += len; // always keep a wfifo_size reserve in the buffer - // For inter-server connections, let the reserve be 1/8th of the link size. - newreserve = s->wdata_size + (s->max_wdata>=FIFOSIZE_SERVERLINK?FIFOSIZE_SERVERLINK<<3:wfifo_size); + // For inter-server connections, let the reserve be 1/4th of the link size. + newreserve = s->wdata_size + (s->max_wdata>=FIFOSIZE_SERVERLINK?FIFOSIZE_SERVERLINK/4:wfifo_size); if(s->wdata_size >= frame_size) send_from_fifo(fd); diff --git a/src/map/pc.c b/src/map/pc.c index f7b9167f6..b0c20ed41 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -794,7 +794,6 @@ int pc_reg_received(struct map_session_data *sd) sd->change_level = pc_readglobalreg(sd,"jobchange_level"); sd->die_counter = pc_readglobalreg(sd,"PC_DIE_COUNTER"); - chrif_scdata_request(sd->status.account_id, sd->status.char_id); if (pc_checkskill(sd, TK_MISSION)) { sd->mission_mobid = pc_readglobalreg(sd,"TK_MISSION_ID"); @@ -861,6 +860,8 @@ int pc_reg_received(struct map_session_data *sd) } status_calc_pc(sd,1); + chrif_scdata_request(sd->status.account_id, sd->status.char_id); + if (!sd->state.connect_new && sd->fd) { //Character already loaded map! Gotta trigger LoadEndAck manually. sd->state.connect_new = 1; |