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

some compilation warning fixes

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12206 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2008-02-15 12:22:03 +00:00
parent b8cbeb24b8
commit 8c92106315
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/map/irc.c
View File

@ -182,8 +182,6 @@ void irc_parse_sub(int fd, char *incoming_string)
char *source_host=NULL; char *source_host=NULL;
char *state_mgr=NULL; char *state_mgr=NULL;
int i=0;
memset(source,'\0',256); memset(source,'\0',256);
memset(command,'\0',256); memset(command,'\0',256);
memset(target,'\0',256); memset(target,'\0',256);

2
src/map/pc.c
View File

@ -6176,8 +6176,8 @@ int pc_addeventtimer(struct map_session_data *sd,int tick,const char *name)
*------------------------------------------*/ *------------------------------------------*/
int pc_deleventtimer(struct map_session_data *sd,const char *name) int pc_deleventtimer(struct map_session_data *sd,const char *name)
{ {
char* p = NULL;
int i; int i;
char* p;
nullpo_retr(0, sd); nullpo_retr(0, sd);

18
src/map/script.c
View File

@ -4450,20 +4450,16 @@ BUILDIN_FUNC(warpparty)
*------------------------------------------*/ *------------------------------------------*/
BUILDIN_FUNC(warpguild) BUILDIN_FUNC(warpguild)
{ {
int x,y;
unsigned short mapindex;
const char *str;
int gid;
TBL_PC *sd; TBL_PC *sd;
TBL_PC *pl_sd; TBL_PC *pl_sd;
struct guild* g; struct guild* g;
struct s_mapiterator* iter; struct s_mapiterator* iter;
int type; int type;
str=script_getstr(st,2); const char* str = script_getstr(st,2);
x=script_getnum(st,3); int x = script_getnum(st,3);
y=script_getnum(st,4); int y = script_getnum(st,4);
gid=script_getnum(st,5); int gid = script_getnum(st,5);
sd=script_rid2sd(st); sd=script_rid2sd(st);
if( sd == NULL ) if( sd == NULL )
@ -4479,8 +4475,6 @@ BUILDIN_FUNC(warpguild)
: ( strcmp(str,"SavePointAll")==0 ) ? 1 : ( strcmp(str,"SavePointAll")==0 ) ? 1
: ( strcmp(str,"SavePoint")==0 ) ? 2 : ( strcmp(str,"SavePoint")==0 ) ? 2
: 3; : 3;
if( type == 3 )
mapindex = mapindex_name2id(str);
iter = mapit_getallusers(); iter = mapit_getallusers();
for( pl_sd = (TBL_PC*)mapit_first(iter); mapit_exists(iter); pl_sd = (TBL_PC*)mapit_next(iter) ) for( pl_sd = (TBL_PC*)mapit_first(iter); mapit_exists(iter); pl_sd = (TBL_PC*)mapit_next(iter) )
@ -4504,7 +4498,7 @@ BUILDIN_FUNC(warpguild)
break; break;
case 3: // m,x,y case 3: // m,x,y
if(!map[pl_sd->bl.m].flag.noreturn && !map[pl_sd->bl.m].flag.nowarp) if(!map[pl_sd->bl.m].flag.noreturn && !map[pl_sd->bl.m].flag.nowarp)
pc_setpos(pl_sd,mapindex,x,y,3); pc_setpos(pl_sd,mapindex_name2id(str),x,y,3);
break; break;
} }
} }
@ -7918,7 +7912,7 @@ BUILDIN_FUNC(getusers)
BUILDIN_FUNC(getusersname) BUILDIN_FUNC(getusersname)
{ {
TBL_PC *sd, *pl_sd; TBL_PC *sd, *pl_sd;
int i=0,disp_num=1; int disp_num=1;
struct s_mapiterator* iter; struct s_mapiterator* iter;
sd = script_rid2sd(st); sd = script_rid2sd(st);