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

- Fixed some line delimiter issues in script.c

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9196 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-11-10 22:47:08 +00:00
parent 3b530a5702
commit 5166b75157
2 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/map/pc.c
View File

@ -783,7 +783,6 @@ int pc_authfail(struct map_session_data *sd) {
//Attempts to set a mob. //Attempts to set a mob.
int pc_set_hate_mob(struct map_session_data *sd, int pos, struct block_list *bl) int pc_set_hate_mob(struct map_session_data *sd, int pos, struct block_list *bl)
{ {
const char hate_var[3][NAME_LENGTH] = {"PC_HATE_MOB_SUN","PC_HATE_MOB_MOON","PC_HATE_MOB_STAR"};
int class_; int class_;
if (!sd || !bl || pos < 0 || pos > 2) if (!sd || !bl || pos < 0 || pos > 2)
return 0; return 0;

84
src/map/script.c
View File

@ -9090,48 +9090,48 @@ int buildin_failedremovecards(struct script_state *st)
return 0; return 0;
} }
/* ================================================================ /* ================================================================
* mapwarp "<from map>","<to map>",<x>,<y>,<type>,<ID for Type>; * mapwarp "<from map>","<to map>",<x>,<y>,<type>,<ID for Type>;
* type: 0=everyone, 1=guild, 2=party(uncoded); [Reddozen] * type: 0=everyone, 1=guild, 2=party(uncoded); [Reddozen]
* ================================================================ * ================================================================
*/ */
int buildin_mapwarp(struct script_state *st) // Added by RoVeRT int buildin_mapwarp(struct script_state *st) // Added by RoVeRT
{ {
int x,y,m,check_val=0,check_ID=0,i=0; int x,y,m,check_val=0,check_ID=0,i=0;
char *str; char *str;
char *mapname; char *mapname;
unsigned int index; unsigned int index;
mapname=conv_str(st,& (st->stack->stack_data[st->start+2])); mapname=conv_str(st,& (st->stack->stack_data[st->start+2]));
str=conv_str(st,& (st->stack->stack_data[st->start+3])); str=conv_str(st,& (st->stack->stack_data[st->start+3]));
x=conv_num(st,& (st->stack->stack_data[st->start+4])); x=conv_num(st,& (st->stack->stack_data[st->start+4]));
y=conv_num(st,& (st->stack->stack_data[st->start+5])); y=conv_num(st,& (st->stack->stack_data[st->start+5]));
check_val=conv_num(st,& (st->stack->stack_data[st->start+6])); check_val=conv_num(st,& (st->stack->stack_data[st->start+6]));
check_ID=conv_num(st,& (st->stack->stack_data[st->start+7])); check_ID=conv_num(st,& (st->stack->stack_data[st->start+7]));
if( (m=map_mapname2mapid(mapname))< 0) if( (m=map_mapname2mapid(mapname))< 0)
return 0; return 0;
if(!(index=mapindex_name2id(str))) if(!(index=mapindex_name2id(str)))
return 0; return 0;
if(!(check_val)) if(!(check_val))
map_foreachinmap(buildin_areawarp_sub, map_foreachinmap(buildin_areawarp_sub,
m,BL_PC,index,x,y); m,BL_PC,index,x,y);
if(check_val==1){ if(check_val==1){
struct guild *g = guild_search(check_ID); struct guild *g = guild_search(check_ID);
if (g){ if (g){
for( i=0; i < g->max_member; i++) for( i=0; i < g->max_member; i++)
{ {
if(g->member[i].sd && g->member[i].sd->bl.m==m){ if(g->member[i].sd && g->member[i].sd->bl.m==m){
pc_setpos(g->member[i].sd,index,x,y,3); pc_setpos(g->member[i].sd,index,x,y,3);
} }
} }
} }
} }
return 0; return 0;
} }
int buildin_cmdothernpc(struct script_state *st) // Added by RoVeRT int buildin_cmdothernpc(struct script_state *st) // Added by RoVeRT