diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-08 17:13:39 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-08 17:13:39 +0000 |
| commit | 01a1daae3343e0c993de83e7c38fab6a7f5bf5d4 (patch) | |
| tree | 7e0e7ccec5596458330b2a87c7f7f9bb38c1bbda /src/map/script.c | |
| parent | 89a113a0cf69be3a30d0c2999557ff21c2049d51 (diff) | |
| download | hercules-01a1daae3343e0c993de83e7c38fab6a7f5bf5d4.tar.gz hercules-01a1daae3343e0c993de83e7c38fab6a7f5bf5d4.tar.bz2 hercules-01a1daae3343e0c993de83e7c38fab6a7f5bf5d4.tar.xz hercules-01a1daae3343e0c993de83e7c38fab6a7f5bf5d4.zip | |
- 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
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 6 |
1 files changed, 4 insertions, 2 deletions
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;i<n;i++){ - struct map_session_data *sd=cd->usersd[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) |