- Updated battle_switch to use strncmpi instead of strcmpi, it makes it so using "yessir" will match "yes", this is actually needed because if you set a config setting to "yes " (notice the trailing space), then the map config engine fails to read it right, and will set the config setting to 0 (no).

- Added function pc_resethate to more easily handle Angel trigger
- Made feel_var and hate_var static variables to pc.c to simplify things and avoid errors due to redundancy.
- Updated the show_mob_info setting to add another space to the separating pipes, so that each field is separated by " | " instead of " |".


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

1 files changed, 4 insertions, 4 deletions

diff --git a/src/map/clif.c b/src/map/clif.c
index 569359049..17acf4ee7 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -7857,15 +7857,15 @@ int clif_charnameack (int fd, struct block_list *bl)
 

 				WBUFW(buf, 0) = cmd = 0x195;

 				if (battle_config.show_mob_info&4)

-					str_p += sprintf(str_p, "Lv. %d |", md->level);

+					str_p += sprintf(str_p, "Lv. %d | ", md->level);

 				if (battle_config.show_mob_info&1)

-					str_p += sprintf(str_p, "HP: %u/%u |", md->status.hp, md->status.max_hp);

+					str_p += sprintf(str_p, "HP: %u/%u | ", md->status.hp, md->status.max_hp);

 				if (battle_config.show_mob_info&2)

-					str_p += sprintf(str_p, "HP: %d%% |", 100*md->status.hp/md->status.max_hp);

+					str_p += sprintf(str_p, "HP: %d%% | ", 100*md->status.hp/md->status.max_hp);

 				//Even thought mobhp ain't a name, we send it as one so the client

 				//can parse it. [Skotlex]

 				if (str_p != mobhp) {

-					*(str_p-2) = '\0'; //Remove trailing space + pipe.

+					*(str_p-3) = '\0'; //Remove trailing space + pipe.

 					memcpy(WBUFP(buf,30), mobhp, NAME_LENGTH);

 					WBUFB(buf,54) = 0;

 					memcpy(WBUFP(buf,78), mobhp, NAME_LENGTH);