Enhanced the 'hack on npc menu' message in clif_parse_NpcSelectMenu.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13633 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2009-03-29 09:30:59 +00:00
parent 4b66f607eb
commit 6578f10ffa

View File

@ -9797,16 +9797,19 @@ void clif_parse_WeaponRefine(int fd, struct map_session_data *sd)
*------------------------------------------*/ *------------------------------------------*/
void clif_parse_NpcSelectMenu(int fd,struct map_session_data *sd) void clif_parse_NpcSelectMenu(int fd,struct map_session_data *sd)
{ {
uint8 select; int npc_id = RFIFOL(fd,2);
uint8 select = RFIFOB(fd,6);
select = RFIFOB(fd,6); if( (select > sd->npc_menu && select != 0xff) || select == 0 )
if((select > sd->npc_menu && select != 0xff) || !select){ {
ShowWarning("Hack on NPC Select Menu: %s (AID: %d)!\n",sd->status.name,sd->bl.id); TBL_NPC* nd = map_id2nd(npc_id);
ShowWarning("Invalid menu selection on npc %d:'%s' - got %d, valid range is [%d..%d] (player AID:%d, CID:%d, name:'%s')!\n", npc_id, (nd)?nd->name:"invalid npc id", select, 1, sd->npc_menu, sd->bl.id, sd->status.char_id, sd->status.name);
clif_GM_kick(NULL,sd); clif_GM_kick(NULL,sd);
} else { return;
sd->npc_menu=select;
npc_scriptcont(sd,RFIFOL(fd,2));
} }
sd->npc_menu = select;
npc_scriptcont(sd,npc_id);
} }
/*========================================== /*==========================================