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

Xantara's fix for bugreport:5201, bugreport:5222 and bugreport:5227 (@command related stuff)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15418 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shennetsind 2012-01-10 21:07:01 +00:00
parent cdb83dd195
commit 693e77032b
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/map/atcommand.c
View File

@ -9305,6 +9305,7 @@ int atcommand_config_read(const char* cfgName)
char line[1024], w1[1024], w2[1024], w3[1024], w4[1024]; char line[1024], w1[1024], w2[1024], w3[1024], w4[1024];
AtCommandInfo* p; AtCommandInfo* p;
FILE* fp; FILE* fp;
int i;
if( (fp = fopen(cfgName, "r")) == NULL ) { if( (fp = fopen(cfgName, "r")) == NULL ) {
ShowError("AtCommand configuration file not found: %s\n", cfgName); ShowError("AtCommand configuration file not found: %s\n", cfgName);
@ -9314,8 +9315,7 @@ int atcommand_config_read(const char* cfgName)
while( fgets(line, sizeof(line), fp) ) { while( fgets(line, sizeof(line), fp) ) {
if( line[0] == '/' && line[1] == '/' ) if( line[0] == '/' && line[1] == '/' )
continue; continue;
if( ( i = sscanf(line,"%1023[^:]:%1023[^,],%1023[^[][%1023[^]]",w1,w2,w3,w4) ) >= 3 ) {
if( ( sscanf(line,"%1023[^:]:%1023[^,],%1023[^[][%1023[^]]",w1,w2,w3,w4) ) == 4 ) {
if( ( p = (AtCommandInfo*)strdb_get(atcommand_db, w1) ) != NULL ) { if( ( p = (AtCommandInfo*)strdb_get(atcommand_db, w1) ) != NULL ) {
p->level = atoi(w2);//update @level p->level = atoi(w2);//update @level
@ -9324,13 +9324,17 @@ int atcommand_config_read(const char* cfgName)
/** /**
* Parse the alises * Parse the alises
**/ **/
atcommand_parse_aliases(w4,p); if( i == 4 )
atcommand_parse_aliases(w4,p);
continue;//we're done move on continue;//we're done move on
} }
} else if( strcmpi(w1, "import") != 0 && strcmpi(w1, "command_symbol") != 0 && strcmpi(w1, "char_symbol") != 0 ) } else if( strcmpi(w1, "import") != 0 && strcmpi(w1, "command_symbol") != 0 && strcmpi(w1, "char_symbol") != 0 ) {
if( i > 1 )
ShowWarning("Unknown setting '%s' in file %s\n", w1, cfgName);
continue; continue;
}
normalize_name(w2," ");//trim
if( strcmpi(w1, "import") == 0 ) if( strcmpi(w1, "import") == 0 )
atcommand_config_read(w2); atcommand_config_read(w2);
else if( strcmpi(w1, "command_symbol") == 0 && else if( strcmpi(w1, "command_symbol") == 0 &&
@ -9347,8 +9351,6 @@ int atcommand_config_read(const char* cfgName)
w2[0] != '$' && w2[0] != '$' &&
w2[0] != '@' ) w2[0] != '@' )
charcommand_symbol = w2[0]; charcommand_symbol = w2[0];
else
ShowWarning("Unknown setting '%s' in file %s\n", w1, cfgName);
} }
fclose(fp); fclose(fp);