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

* Improved changes to script command 'waitingroom' from r14772.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14773 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ai4rei 2011-04-06 16:55:59 +00:00
parent fbb16c5ccb
commit 04d4e18863
1 changed files with 13 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/map/script.c
View File

@ -9447,54 +9447,29 @@ BUILDIN_FUNC(warpwaitingpc)
for( i = 0; i < n && cd->users > 0; i++ ) for( i = 0; i < n && cd->users > 0; i++ )
{ {
sd = cd->usersd[0]; sd = cd->usersd[0];
if( sd == NULL )
{ if( strcmp(map_name,"SavePoint") == 0 && map[sd->bl.m].flag.noteleport )
ShowDebug("script:warpwaitingpc: no user in chat room position 0 (cd->users=%d,%d/%d)\n", cd->users, i, n); {// can't teleport on this map
mapreg_setreg(reference_uid(add_str("$@warpwaitingpc"), i), 0); break;
continue;// Broken npc chat room? }
if( cd->zeny )
{// fee set
if( (uint32)sd->status.zeny < cd->zeny )
{// no zeny to cover set fee
break;
}
pc_payzeny(sd, cd->zeny);
} }
mapreg_setreg(reference_uid(add_str("$@warpwaitingpc"), i), sd->bl.id); mapreg_setreg(reference_uid(add_str("$@warpwaitingpc"), i), sd->bl.id);
if( strcmp(map_name,"Random") == 0 ) if( strcmp(map_name,"Random") == 0 )
{
if( cd->zeny )
{// fee set
if( (uint32)sd->status.zeny < cd->zeny )
{// no zeny to cover set fee
return 0;
}
pc_payzeny(sd, cd->zeny);
}
pc_randomwarp(sd,CLR_TELEPORT); pc_randomwarp(sd,CLR_TELEPORT);
}
else if( strcmp(map_name,"SavePoint") == 0 ) else if( strcmp(map_name,"SavePoint") == 0 )
{
if( map[sd->bl.m].flag.noteleport )
return 0;// can't teleport on this map
if( cd->zeny )
{// fee set
if( (uint32)sd->status.zeny < cd->zeny )
{// no zeny to cover set fee
return 0;
}
pc_payzeny(sd, cd->zeny);
}
pc_setpos(sd, sd->status.save_point.map, sd->status.save_point.x, sd->status.save_point.y, CLR_TELEPORT); pc_setpos(sd, sd->status.save_point.map, sd->status.save_point.x, sd->status.save_point.y, CLR_TELEPORT);
}
else else
{
if( cd->zeny )
{// fee set
if( (uint32)sd->status.zeny < cd->zeny )
{// no zeny to cover set fee
return 0;
}
pc_payzeny(sd, cd->zeny);
}
pc_setpos(sd, mapindex_name2id(map_name), x, y, CLR_OUTSIGHT); pc_setpos(sd, mapindex_name2id(map_name), x, y, CLR_OUTSIGHT);
}
} }
mapreg_setreg(add_str("$@warpwaitingpcnum"), i); mapreg_setreg(add_str("$@warpwaitingpcnum"), i);
return 0; return 0;