From c2e7d12b8baff6c190b1a61c175366a6af15326d Mon Sep 17 00:00:00 2001 From: ultramage Date: Mon, 11 Feb 2008 17:46:31 +0000 Subject: Getting rid of map_getallusers(), part 1 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12195 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/script.c | 219 ++++++++++++++++++++++++------------------------------- 1 file changed, 96 insertions(+), 123 deletions(-) (limited to 'src/map/script.c') diff --git a/src/map/script.c b/src/map/script.c index d10d8c935..3294455a1 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -4318,32 +4318,26 @@ BUILDIN_FUNC(areawarp) *------------------------------------------*/ BUILDIN_FUNC(warpchar) { - int x,y,a,i; + int x,y,a; const char *str; - TBL_PC *sd, **pl_allsd; - int users; + TBL_PC *sd; str=script_getstr(st,2); x=script_getnum(st,3); y=script_getnum(st,4); a=script_getnum(st,5); - - pl_allsd = map_getallusers(&users); - - for(i=0; istatus.char_id == a) { - - if(strcmp(str, "Random") == 0) - pc_randomwarp(sd, 3); - - else if(strcmp(str, "SavePoint") == 0) - pc_setpos(sd, sd->status.save_point.map,sd->status.save_point.x, sd->status.save_point.y, 3); - - else - pc_setpos(sd, mapindex_name2id(str), x, y, 3); - } - } + + sd = map_charid2sd(a); + if( sd == NULL ) + return 0; + + if(strcmp(str, "Random") == 0) + pc_randomwarp(sd, 3); + else + if(strcmp(str, "SavePoint") == 0) + pc_setpos(sd, sd->status.save_point.map,sd->status.save_point.x, sd->status.save_point.y, 3); + else + pc_setpos(sd, mapindex_name2id(str), x, y, 3); return 0; } @@ -4459,87 +4453,63 @@ BUILDIN_FUNC(warpguild) int x,y; unsigned short mapindex; const char *str; - int g; - int i; - TBL_PC *pl_sd, **pl_allsd; - int users; + int gid; TBL_PC *sd; + TBL_PC *pl_sd; + struct guild* g; + struct s_mapiterator* iter; + int type; + str=script_getstr(st,2); x=script_getnum(st,3); y=script_getnum(st,4); - g=script_getnum(st,5); + gid=script_getnum(st,5); + sd=script_rid2sd(st); if( sd == NULL ) return 0; - + g = guild_search(gid); + if( g == NULL ) + return 0; if(map[sd->bl.m].flag.noreturn || map[sd->bl.m].flag.nowarpto) return 0; - if(g < 1) - return 0; - - pl_allsd = map_getallusers(&users); + type = ( strcmp(str,"Random")==0 ) ? 0 + : ( strcmp(str,"SavePointAll")==0 ) ? 1 + : ( strcmp(str,"SavePoint")==0 ) ? 2 + : 3; + if( type == 3 ) + mapindex = mapindex_name2id(str); - if(strcmp(str,"Random")==0) + iter = mapit_getallusers(); + for( pl_sd = (TBL_PC*)mapit_first(iter); mapit_exists(iter); pl_sd = (TBL_PC*)mapit_next(iter) ) { - - for (i = 0; i < users; i++) + if( pl_sd->status.guild_id != gid ) + continue; + + switch( type ) { - if ((pl_sd = pl_allsd[i]) && pl_sd->status.guild_id == g) - { - if(map[pl_sd->bl.m].flag.nowarp) - continue; + case 0: // Random + if(!map[pl_sd->bl.m].flag.nowarp) pc_randomwarp(pl_sd,3); - } - } - } - else if(strcmp(str,"SavePointAll")==0) - { - if(map[sd->bl.m].flag.noreturn) - return 0; - - for (i = 0; i < users; i++) - { - if ((pl_sd = pl_allsd[i]) && pl_sd->status.guild_id == g) - { - if(map[pl_sd->bl.m].flag.noreturn) - continue; + break; + case 1: // SavePointAll + if(!map[pl_sd->bl.m].flag.noreturn) pc_setpos(pl_sd,pl_sd->status.save_point.map,pl_sd->status.save_point.x,pl_sd->status.save_point.y,3); - } - } - } - else if(strcmp(str,"SavePoint")==0) - { - if(map[sd->bl.m].flag.noreturn) - return 0; - - mapindex=sd->status.save_point.map; - x=sd->status.save_point.x; - y=sd->status.save_point.y; - for (i = 0; i < users; i++) - { - if ((pl_sd = pl_allsd[i]) && pl_sd->status.guild_id == g) - { - if(map[pl_sd->bl.m].flag.noreturn) - continue; - pc_setpos(pl_sd,mapindex,x,y,3); - } - } - } - else - { - mapindex = mapindex_name2id(str); - for (i = 0; i < users; i++) - { - if ((pl_sd = pl_allsd[i]) && pl_sd->status.guild_id == g) - { - if(map[pl_sd->bl.m].flag.noreturn || map[pl_sd->bl.m].flag.nowarp) - continue; + break; + case 2: // SavePoint + if(!map[pl_sd->bl.m].flag.noreturn) + pc_setpos(pl_sd,sd->status.save_point.map,sd->status.save_point.x,sd->status.save_point.y,3); + break; + case 3: // m,x,y + if(!map[pl_sd->bl.m].flag.noreturn && !map[pl_sd->bl.m].flag.nowarp) pc_setpos(pl_sd,mapindex,x,y,3); - } + break; } } + mapit_free(iter); + return 0; } /*========================================== @@ -7947,24 +7917,25 @@ BUILDIN_FUNC(getusers) *------------------------------------------*/ BUILDIN_FUNC(getusersname) { - TBL_PC *sd, *pl_sd = NULL, **pl_allsd; - int i=0,disp_num=1, users; + TBL_PC *sd, *pl_sd; + int i=0,disp_num=1; + struct s_mapiterator* iter; - sd = script_rid2sd(st); + sd = script_rid2sd(st); if (!sd) return 0; - pl_allsd = map_getallusers(&users); - - for (i=0;ioid); - clif_scriptmes(sd,st->oid,pl_sd->status.name); - } + if( battle_config.hide_GM_session && pc_isGM(pl_sd) ) + continue; // skip hidden GMs + + if((disp_num++)%10==0) + clif_scriptnext(sd,st->oid); + clif_scriptmes(sd,st->oid,pl_sd->status.name); } + mapit_free(iter); + return 0; } /*========================================== @@ -9023,34 +8994,37 @@ BUILDIN_FUNC(removemapflag) BUILDIN_FUNC(pvpon) { - int m,i,users; + int m; const char *str; - TBL_PC *pl_sd=NULL, **pl_allsd; + TBL_PC* sd = NULL; + struct s_mapiterator* iter; - str=script_getstr(st,2); + str = script_getstr(st,2); m = map_mapname2mapid(str); - if(m >= 0 && !map[m].flag.pvp) { - map[m].flag.pvp = 1; - clif_send0199(m,1); + if( m < 0 || map[m].flag.pvp ) + return 0; // nothing to do - if(battle_config.pk_mode) // disable ranking functions if pk_mode is on [Valaris] - return 0; + map[m].flag.pvp = 1; + clif_send0199(m,1); - pl_allsd = map_getallusers(&users); - - for(i=0;ibl.m && pl_sd->pvp_timer == -1) - { - pl_sd->pvp_timer=add_timer(gettick()+200,pc_calc_pvprank_timer,pl_sd->bl.id,0); - pl_sd->pvp_rank=0; - pl_sd->pvp_lastusers=0; - pl_sd->pvp_point=5; - pl_sd->pvp_won = 0; - pl_sd->pvp_lost = 0; - } - } + if(battle_config.pk_mode) // disable ranking functions if pk_mode is on [Valaris] + return 0; + + iter = mapit_getallusers(); + for( sd = (TBL_PC*)mapit_first(iter); mapit_exists(iter); sd = (TBL_PC*)mapit_next(iter) ) + { + if( sd->bl.m != m || sd->pvp_timer != -1 ) + continue; // not applicable + + sd->pvp_timer = add_timer(gettick()+200,pc_calc_pvprank_timer,sd->bl.id,0); + sd->pvp_rank = 0; + sd->pvp_lastusers = 0; + sd->pvp_point = 5; + sd->pvp_won = 0; + sd->pvp_lost = 0; } + mapit_free(iter); + return 0; } @@ -10664,20 +10638,19 @@ BUILDIN_FUNC(dispbottom) *------------------------------------------*/ BUILDIN_FUNC(recovery) { - TBL_PC *sd, **all_sd; - int i = 0, users; + TBL_PC* sd; + struct s_mapiterator* iter; - all_sd = map_getallusers(&users); - - for (i = 0; i < users; i++) + iter = mapit_getallusers(); + for( sd = (TBL_PC*)mapit_first(iter); mapit_exists(iter); sd = (TBL_PC*)mapit_next(iter) ) { - sd = all_sd[i]; if(pc_isdead(sd)) status_revive(&sd->bl, 100, 100); else status_percent_heal(&sd->bl, 100, 100); clif_displaymessage(sd->fd,"You have been recovered!"); } + mapit_free(iter); return 0; } /*========================================== -- cgit v1.2.3-60-g2f50