- Added a comment explaining what a comment is to login/char/map config files, as well as the main script config file.

- Modified SG_FEEL so that it works the same way that in Aegis (packet-wise)
- Added a comment to explain how to "remove" a string variable from the msg_athena entries.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8707 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 6 insertions, 7 deletions

diff --git a/src/map/clif.c b/src/map/clif.c
index 73ab29e6b..569359049 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -11514,18 +11514,19 @@ void clif_parse_FeelSaveOk(int fd,struct map_session_data *sd)
 		return;

 	i = sd->menuskill_lv-1;

 	if (i<0 || i > 2) return; //Bug?

+

 	sd->feel_map[i].index = map[sd->bl.m].index;

 	sd->feel_map[i].m = sd->bl.m;

 	pc_setglobalreg(sd,feel_var[i],map[sd->bl.m].index);

-	

+

+	clif_misceffect2(&sd->bl, 0x1b0);

+	clif_misceffect2(&sd->bl, 0x21f);

 	WFIFOHEAD(fd,packet_len_table[0x20e]);

 	WFIFOW(fd,0)=0x20e;

 	memcpy(WFIFOP(fd,2),map[sd->bl.m].name, MAP_NAME_LENGTH);

 	WFIFOL(fd,26)=sd->bl.id;

 	WFIFOW(fd,30)=i;

 	WFIFOSET(fd, packet_len_table[0x20e]);

-	

-	clif_skill_nodamage(&sd->bl,&sd->bl,sd->menuskill_id,sd->menuskill_lv,1);

 	sd->menuskill_lv = sd->menuskill_id = 0;

 }

 

diff --git a/src/map/skill.c b/src/map/skill.c
index 92ad67ecd..78ef53fb5 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -5404,12 +5404,10 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 		break;
 
 	case SG_FEEL:
+		//AuronX reported you CAN memorize the same map as all three. [Skotlex]
 		if (sd) {
-			if(!sd->feel_map[skilllv-1].index) {
-				//AuronX reported you CAN memorize the same map as all three. [Skotlex]
-				clif_skill_nodamage(src,bl,skillid,skilllv,1);
+			if(!sd->feel_map[skilllv-1].index)
 				clif_parse_ReqFeel(sd->fd,sd, skilllv);
-			}
 			else
 				clif_feel_info(sd, skilllv-1);
 		}