Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Now you can trade while in a chatroom.

Browse Source 
- Fixed homun-txt reading when the file has DOS line-type delimiters (\r\n)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8944 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-10-06 13:28:36 +00:00
parent e34216738c
commit b32fa6c1cb
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog-Trunk.txt
View File

@ -3,6 +3,10 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. 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. 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 2006/10/05
* skill_blown will now trigger on-touch npcs on the landing tile. [Skotlex] * skill_blown will now trigger on-touch npcs on the landing tile. [Skotlex]
* Max trade distance has been reduced from 5 to 2. [Skotlex] * Max trade distance has been reduced from 5 to 2. [Skotlex]

2
src/char/int_homun.c
View File

@ -92,7 +92,7 @@ int inter_homun_fromstr(char *str,struct s_homunculus *p)
p->luk = tmp_int[17]; p->luk = tmp_int[17];
//Read skills. //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) if (sscanf(str+next, "%d,%d,%n", &tmp_int[0], &tmp_int[1], &len) != 2)
return 2; return 2;

6
src/map/clif.c
View File

@ -9533,8 +9533,8 @@ void clif_parse_TradeRequest(int fd,struct map_session_data *sd)
RFIFOHEAD(fd); RFIFOHEAD(fd);
t_sd = map_id2sd(RFIFOL(sd->fd,2)); t_sd = map_id2sd(RFIFOL(sd->fd,2));
if(clif_cant_act(sd)) if(!sd->chatID && clif_cant_act(sd))
return; return; //You can trade while in a chatroom.
// @noask [LuzZza] // @noask [LuzZza]
if(t_sd) { 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); clif_noask_sub(sd, t_sd, 0);
return; return;
} }
if(clif_cant_act(t_sd)) if(!t_sd->chatID && clif_cant_act(t_sd))
return; return;
} }