diff options
| -rw-r--r-- | Changelog-Trunk.txt | 3 | ||||
| -rw-r--r-- | src/common/socket.c | 4 | ||||
| -rw-r--r-- | src/map/pc.c | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 75498e7fb..046dee553 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,9 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2004/12/05 + * Fixed sc data load failing when using charsave_method: 1 [Skotlex] + * Fixed the interserver link reserve size being 8 times instead of 1/8th + the default size. Changed it to be 1/4th as well. [Skotlex] * Found the position of emblem_id in packet 1b6. [FlavioJS] * Moved START_ACCOUNT_NUM and END_ACCOUNT_NUM from login.h to mmo.h and changed clif_guess_PacketVer to use that. [FlavioJS] 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; |