From 01a1daae3343e0c993de83e7c38fab6a7f5bf5d4 Mon Sep 17 00:00:00 2001 From: skotlex Date: Sat, 8 Jul 2006 17:13:39 +0000 Subject: - Fixed the char table having party/guild_id as smallint when they need int there. Thanks to hermematon for pointing it out (use svn_ugprade7580.sql) - Applied k3dt fixes to pet-hatching, ice-wall check, and wedding skills. - Fixed endow skills calling the skill no damage packet twice. - Fixed a crash on warpwaitingpc when the chat-room is empty. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7580 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/script.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/map/script.c') diff --git a/src/map/script.c b/src/map/script.c index 22cd3c8a0..26ae86ee1 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -6804,6 +6804,7 @@ int buildin_warpwaitingpc(struct script_state *st) char *str; struct npc_data *nd=(struct npc_data *)map_id2bl(st->oid); struct chat_data *cd; + struct map_session_data *sd; if(nd==NULL || (cd=(struct chat_data *)map_id2bl(nd->chat_id))==NULL ) return 0; @@ -6817,8 +6818,9 @@ int buildin_warpwaitingpc(struct script_state *st) n=conv_num(st,& (st->stack->stack_data[st->start+5])); for(i=0;iusersd[0]; // リスト先頭のPCを次々に。 - + sd=cd->usersd[0]; + if (!sd) continue; //Broken npc chat room? + mapreg_setreg(add_str((unsigned char *) "$@warpwaitingpc")+(i<<24),sd->bl.id); if(strcmp(str,"Random")==0) -- cgit v1.2.3-70-g09d2