diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-10-06 13:28:36 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-10-06 13:28:36 +0000 |
| commit | cf10605ca4f989fdffaf12c06006a8f8fa14c383 (patch) | |
| tree | 076d123a03bb4b8e3f0e046afe0ddcc58679470e | |
| parent | 0274c80ae6686b12763ca9ec9a5911e313bdaf64 (diff) | |
| download | hercules-cf10605ca4f989fdffaf12c06006a8f8fa14c383.tar.gz hercules-cf10605ca4f989fdffaf12c06006a8f8fa14c383.tar.bz2 hercules-cf10605ca4f989fdffaf12c06006a8f8fa14c383.tar.xz hercules-cf10605ca4f989fdffaf12c06006a8f8fa14c383.zip | |
- Now you can trade while in a chatroom.
- Fixed homun-txt reading when the file has DOS line-type delimiters (\r\n)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8944 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 4 | ||||
| -rw-r--r-- | src/char/int_homun.c | 2 | ||||
| -rw-r--r-- | src/map/clif.c | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 556ac8a98..4593d8195 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,10 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2006/10/06
+ * Now you can trade while in a chatroom. [Skotlex]
+ * Fixed homun-txt reading when the file has DOS line-type delimiters (\r\n)
+ [Skotlex]
2006/10/05
* skill_blown will now trigger on-touch npcs on the landing tile. [Skotlex]
* Max trade distance has been reduced from 5 to 2. [Skotlex]
diff --git a/src/char/int_homun.c b/src/char/int_homun.c index fc06995c6..886c56f06 100644 --- a/src/char/int_homun.c +++ b/src/char/int_homun.c @@ -92,7 +92,7 @@ int inter_homun_fromstr(char *str,struct s_homunculus *p) p->luk = tmp_int[17];
//Read skills.
- while(str[next] && str[next] != '\n') {
+ while(str[next] && str[next] != '\n' && str[next] != '\r') {
if (sscanf(str+next, "%d,%d,%n", &tmp_int[0], &tmp_int[1], &len) != 2)
return 2;
diff --git a/src/map/clif.c b/src/map/clif.c index 3164fe950..35ade7ce3 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -9533,8 +9533,8 @@ void clif_parse_TradeRequest(int fd,struct map_session_data *sd) RFIFOHEAD(fd);
t_sd = map_id2sd(RFIFOL(sd->fd,2));
- if(clif_cant_act(sd))
- return;
+ if(!sd->chatID && clif_cant_act(sd))
+ return; //You can trade while in a chatroom.
// @noask [LuzZza]
if(t_sd) {
@@ -9542,7 +9542,7 @@ void clif_parse_TradeRequest(int fd,struct map_session_data *sd) clif_noask_sub(sd, t_sd, 0);
return;
}
- if(clif_cant_act(t_sd))
+ if(!t_sd->chatID && clif_cant_act(t_sd))
return;
}
|