- Removed the mysterious array of two of char_dat (char/sql server), replaced it with a static structure.

- Added function char_loadName to extract the character name of a given ID.
- Fixed fame-list updating crashing char-sql server when the given char-id just got into ranking.
- Sorry I didn't check if it compiles cleanly because I don't have sql here <.< (am gonna test it in a second, though)


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

2 files changed, 4 insertions, 5 deletions

diff --git a/src/map/chrif.c b/src/map/chrif.c
index 47704002f..70dad71ab 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -585,7 +585,7 @@ int chrif_searchcharid(int char_id)
 		return -1;

 	chrif_check(-1);

 

-        WFIFOHEAD(char_fd, 6);

+	WFIFOHEAD(char_fd, 6);

 	WFIFOW(char_fd,0) = 0x2b08;

 	WFIFOL(char_fd,2) = char_id;

 	WFIFOSET(char_fd,6);

diff --git a/src/map/clif.c b/src/map/clif.c
index 1ff36c7ec..9236fea2f 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -2463,9 +2463,8 @@ int clif_updatestatus(struct map_session_data *sd,int type)
 		// 00b0

 	case SP_WEIGHT:

 		pc_checkweighticon(sd);

-		// Redundancy? Look above.. - [Lance]

-		//WFIFOW(fd,0)=0xb0;

-		//WFIFOW(fd,2)=type;	//Added this packet back, Temp fix to the slow motion [Lupus]

+		WFIFOW(fd,0)=0xb0;	//Need to re-set as pc_checkweighticon can alter the buffer. [Skotlex]

+		WFIFOW(fd,2)=type;

 		WFIFOL(fd,4)=sd->weight;

 		break;

 	case SP_MAXWEIGHT:

@@ -5145,7 +5144,7 @@ int clif_solved_charname(struct map_session_data *sd,int char_id)
 

 	fd=sd->fd;

 	if(p!=NULL){

-                WFIFOHEAD(fd,packet_len_table[0x194]);

+		WFIFOHEAD(fd,packet_len_table[0x194]);

 		WFIFOW(fd,0)=0x194;

 		WFIFOL(fd,2)=char_id;

 		memcpy(WFIFOP(fd,6), p, NAME_LENGTH);