The new functions now clear junk from the output buffer, this simplifies the code a bit.

Added a TODO for one emblem loading problem/crash.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10969 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage
2007-08-09 11:02:44 +00:00
parent 45824e44b5
commit bc31c68ad5
9 changed files with 34 additions and 29 deletions

View File

@@ -3187,7 +3187,7 @@ int parse_char(int fd)
WFIFOHEAD(fd,28);
WFIFOW(fd,0) = 0x71;
WFIFOL(fd,2) = char_dat.char_id;
safestrncpy((char*)WFIFOP(fd,6), mapindex_getmapname_ext(mapindex_id2name(char_dat.last_point.map),NULL), MAP_NAME_LENGTH_EXT);
mapindex_getmapname_ext(mapindex_id2name(char_dat.last_point.map), (char*)WFIFOP(fd,6));
{
// Advanced subnet check [LuzZza]
uint32 subnet_map_ip;

View File

@@ -441,6 +441,7 @@ struct guild * inter_guild_fromsql(int guild_id)
strncpy(g->mes2,sql_row[10],119);
g->emblem_len=atoi(sql_row[11]);
g->emblem_id=atoi(sql_row[12]);
//FIXME: check for sql_row[13]==NULL, just in case
for(i=0,pstr=sql_row[13],pEmblemData=g->emblem_data; i < g->emblem_len; i++,pstr+=2){
int c1=pstr[0],c2=pstr[1],x1=0,x2=0;
if(c1>='0' && c1<='9')