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

Removed some useless svn:ignore properties.

Browse Source 
Fixed a compilation problem.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12211 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2008-02-16 20:10:25 +00:00
parent 0c61a73f33
commit bcac761953
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/strlib.c
View File

@ -383,7 +383,7 @@ int strline(const char* str, size_t pos)
/// @param len Length of the string /// @param len Length of the string
/// @param startoff Where to start parsing /// @param startoff Where to start parsing
/// @param delim Field delimiter /// @param delim Field delimiter
/// @parem out_pos Array of resulting positions /// @param out_pos Array of resulting positions
/// @param npos Size of the pos array /// @param npos Size of the pos array
/// @param opt Options that determine the parsing behaviour /// @param opt Options that determine the parsing behaviour
/// @return Number of fields in the string or -1 if an error occured /// @return Number of fields in the string or -1 if an error occured

23
src/map/clif.c
View File

@ -12137,23 +12137,12 @@ static int packetdb_readdb(void)
ln++; ln++;
continue; continue;
} }
for(j=0;j<ARRAYLENGTH(clif_parse_func);j++){
if(clif_parse_func[j].name != NULL && strcmp(str[2],clif_parse_func[j].name)==0) // look up processing function by name
{ ARR_FIND( 0, ARRAYLENGTH(clif_parse_func), j, clif_parse_func[j].name != NULL && strcmp(str[2],clif_parse_func[j].name)==0 );
if (packet_db[packet_ver][cmd].func != clif_parse_func[j].func) if( j < ARRAYLENGTH(clif_parse_func) )
{ //If we are updating a function, we need to zero up the previous one. [Skotlex] packet_db[packet_ver][cmd].func = clif_parse_func[j].func;
for(i=0;i<=MAX_PACKET_DB;i++){
if (packet_db[packet_ver][i].func == clif_parse_func[j].func)
{
memset(&packet_db[packet_ver][i], 0, sizeof(struct s_packet_db));
break;
}
}
}
packet_db[packet_ver][cmd].func = clif_parse_func[j].func;
break;
}
}
// set the identifying cmd for the packet_db version // set the identifying cmd for the packet_db version
if (strcmp(str[2],"wanttoconnection")==0) if (strcmp(str[2],"wanttoconnection")==0)
clif_config.connect_cmd[packet_ver] = cmd; clif_config.connect_cmd[packet_ver] = cmd;