|
@@ -6557,14 +6557,13 @@ ACMD_FUNC(mobsearch)
|
|
|
|
|
|
if ((mob_id = atoi(mob_name)) == 0)
|
|
|
mob_id = mobdb_searchname(mob_name);
|
|
|
- if(mob_id > 0 && mobdb_checkid(mob_id) == 0){
|
|
|
+ if( mobdb_checkid(mob_id) == 0){
|
|
|
snprintf(atcmd_output, sizeof atcmd_output, msg_txt(sd,1219),mob_name); // Invalid mob ID %s!
|
|
|
clif_displaymessage(fd, atcmd_output);
|
|
|
return -1;
|
|
|
}
|
|
|
- if(mob_id == atoi(mob_name) && mob_db(mob_id)->jname)
|
|
|
- strcpy(mob_name,mob_db(mob_id)->jname); // --ja--
|
|
|
-// strcpy(mob_name,mob_db(mob_id)->name); // --en--
|
|
|
+ strcpy(mob_name,mob_db(mob_id)->jname); // --ja--
|
|
|
+// strcpy(mob_name,mob_db(mob_id)->name); // --en--
|
|
|
|
|
|
snprintf(atcmd_output, sizeof atcmd_output, msg_txt(sd,1220), mob_name, mapindex_id2name(sd->mapindex)); // Mob Search... %s %s
|
|
|
clif_displaymessage(fd, atcmd_output);
|
|
@@ -6578,7 +6577,7 @@ ACMD_FUNC(mobsearch)
|
|
|
|
|
|
if( md->bl.m != sd->bl.m )
|
|
|
continue;
|
|
|
- if( mob_id != -1 && md->mob_id != mob_id )
|
|
|
+ if( md->mob_id != mob_id )
|
|
|
continue;
|
|
|
|
|
|
++number;
|