Reformatting, warning fixes, unsigned char removal

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10618 54d463be-8e91-2dee-dedb-b68131a5f0ec

src/char_sql/int_party.c

@@ -244,7 +244,7 @@ struct party_data *inter_party_fromsql(int party_id)
 		return NULL;
 	}
 	p->party.party_id = party_id;
-	strncpy(&p->party.name, sql_row[1], NAME_LENGTH);
+	strncpy(p->party.name, sql_row[1], NAME_LENGTH);
 	p->party.exp = atoi(sql_row[2])?1:0;
 	p->party.item = atoi(sql_row[3]);
 	leader_id = atoi(sql_row[4]);

src/map/battle.h

@@ -430,7 +430,7 @@ extern struct Battle_Config {
 	unsigned short override_mob_names; //Enables overriding spawn mob names with the mob_db names. [Skotlex]
 	unsigned short min_chat_delay; //Minimum time between client messages. [Skotlex]
 	unsigned short friend_auto_add; //When accepting friends, both get friended. [Skotlex]
-	unsigned int hvan_explosion_intimate ;	// fix [albator]
+	int hvan_explosion_intimate;	// fix [albator]
 	unsigned short hom_rename;
 	unsigned short homunculus_show_growth ;	//[orn]
 	unsigned short homunculus_friendly_rate;

src/map/clif.c

@@ -1454,7 +1454,7 @@ int clif_homskillinfoblock(struct map_session_data *sd)
 			WFIFOW(fd,len+6) = hd->homunculus.hskill[j].lv ;
 			WFIFOW(fd,len+8) = skill_get_sp(id,hd->homunculus.hskill[j].lv) ;
 			WFIFOW(fd,len+10)= skill_get_range2(&sd->hd->bl, id,hd->homunculus.hskill[j].lv) ;
-			strncpy(WFIFOP(fd,len+12), skill_get_name(id), NAME_LENGTH) ;
+			strncpy((char*)WFIFOP(fd,len+12), skill_get_name(id), NAME_LENGTH) ;
 			WFIFOB(fd,len+36) = (hd->homunculus.hskill[j].lv < merc_skill_tree_get_max(id, hd->homunculus.class_))?1:0;
 			len+=37;
 		}
@@ -4161,7 +4161,7 @@ int clif_skillinfo(struct map_session_data *sd,int skillid,int type,int range)
 		range = skill_get_range2(&sd->bl, id,sd->status.skill[skillid].lv);
 
 	WFIFOW(fd,12)= range;
-	strncpy(WFIFOP(fd,14), skill_get_name(id), NAME_LENGTH);
+	strncpy((char*)WFIFOP(fd,14), skill_get_name(id), NAME_LENGTH);
 	if(sd->status.skill[skillid].flag ==0)
 		WFIFOB(fd,38)= (sd->status.skill[skillid].lv < skill_tree_get_max(id, sd->status.class_))? 1:0;
 	else
@@ -4194,7 +4194,7 @@ int clif_skillinfoblock(struct map_session_data *sd)
 			WFIFOW(fd,len+6) = sd->status.skill[i].lv;
 			WFIFOW(fd,len+8) = skill_get_sp(id,sd->status.skill[i].lv);
 			WFIFOW(fd,len+10)= skill_get_range2(&sd->bl, id,sd->status.skill[i].lv);
-			strncpy(WFIFOP(fd,len+12), skill_get_name(id), NAME_LENGTH);
+			strncpy((char*)WFIFOP(fd,len+12), skill_get_name(id), NAME_LENGTH);
 			if(sd->status.skill[i].flag ==0)
 				WFIFOB(fd,len+36)= (sd->status.skill[i].lv < skill_tree_get_max(id, sd->status.class_))? 1:0;
 			else
@@ -6511,7 +6511,7 @@ int clif_guild_memberlogin_notice(struct guild *g,int idx,int flag)
 int clif_guild_send_onlineinfo(struct map_session_data *sd)
 {
 	struct guild *g;
-	char buf[14*128];
+	unsigned char buf[14*128];
 	int i, count=0, p_len;
 	
 	nullpo_retr(0, sd);
@@ -6534,7 +6534,7 @@ int clif_guild_send_onlineinfo(struct map_session_data *sd)
 		}
 	}
 	
-	clif_send(buf,p_len*count,&sd->bl,SELF);
+	clif_send(buf, p_len*count, &sd->bl, SELF);
 
 	return 0;
 }
@@ -6815,7 +6815,7 @@ int clif_guild_skillinfo(struct map_session_data *sd)
 			WFIFOW(fd,c*37+12) = g->skill[i].lv;
 			WFIFOW(fd,c*37+14) = skill_get_sp(id,g->skill[i].lv);
 			WFIFOW(fd,c*37+16) = skill_get_range(id,g->skill[i].lv);
-			strncpy(WFIFOP(fd,c*37+18), skill_get_name(id), NAME_LENGTH);
+			strncpy((char*)WFIFOP(fd,c*37+18), skill_get_name(id), NAME_LENGTH);
 			if(g->skill[i].lv < guild_skill_get_max(id) && (sd == g->member[0].sd))
 				up = 1;
 			else
@@ -7785,9 +7785,9 @@ void clif_hate_info(struct map_session_data *sd, unsigned char hate_level,int cl
 	WFIFOHEAD(fd,packet_len(0x20e));
 	WFIFOW(fd,0)=0x20e;
 	if (pcdb_checkid(class_))
-		strncpy(WFIFOP(fd,2),job_name(class_), NAME_LENGTH);
+		strncpy((char*)WFIFOP(fd,2),job_name(class_), NAME_LENGTH);
 	else if (mobdb_checkid(class_))
-		strncpy(WFIFOP(fd,2),mob_db(class_)->jname, NAME_LENGTH);
+		strncpy((char*)WFIFOP(fd,2),mob_db(class_)->jname, NAME_LENGTH);
 	else //Really shouldn't happen...
 		memset(WFIFOP(fd,2), 0, NAME_LENGTH);
 	WFIFOL(fd,26)=sd->bl.id;
@@ -7804,7 +7804,7 @@ void clif_mission_info(struct map_session_data *sd, int mob_id, unsigned char pr
 	int fd=sd->fd;
 	WFIFOHEAD(fd,packet_len(0x20e));
 	WFIFOW(fd,0)=0x20e;
-	strncpy(WFIFOP(fd,2),mob_db(mob_id)->jname, NAME_LENGTH);
+	strncpy((char*)WFIFOP(fd,2),mob_db(mob_id)->jname, NAME_LENGTH);
 	WFIFOL(fd,26)=mob_id;
 	WFIFOB(fd,30)=progress; //Message to display
 	WFIFOB(fd,31)=20;
@@ -8381,7 +8381,7 @@ void clif_parse_GetCharNameRequest(int fd, struct map_session_data *sd)
 		//Asked name of invisible player, this shouldn't be possible!
 		//Possible bot? Thanks to veider and qspirit
 		//FIXME: Still isn't perfected as clients keep asking for this on legitimate situations.
-		unsigned char gm_msg[256];
+		char gm_msg[256];
 		sprintf(gm_msg, "Hack on NameRequest: character '%s' (account: %d) requested the name of an invisible target.", sd->status.name, sd->status.account_id);
 		ShowWarning(gm_msg);
 		 // information is sended to all online GM
@@ -8549,7 +8549,7 @@ void clif_parse_MapMove(int fd, struct map_session_data *sd)
 	if(pc_isGM(sd) < get_atcommand_level(AtCommand_MapMove))
 		return;
 
-	map_name = RFIFOP(fd,2);
+	map_name = (char*)RFIFOP(fd,2);
 	map_name[MAP_NAME_LENGTH_EXT-1]='\0';
 	sprintf(output, "%s %d %d", map_name, RFIFOW(fd,18), RFIFOW(fd,20));
 	atcommand_rura(fd, sd, "@rura", output);
@@ -8960,7 +8960,7 @@ void clif_parse_GMmessage(int fd, struct map_session_data *sd)
 		return;
 
 	size = RFIFOW(fd,2)-4;
-	mes = RFIFOP(fd,4);
+	mes = (char*)RFIFOP(fd,4);
 	mes_len_check(mes, size, CHAT_SIZE);
 
 	intif_GMmessage(mes, size, 0);
@@ -9926,7 +9926,7 @@ void clif_parse_LGMmessage(int fd, struct map_session_data *sd)
 		return;
 
 	len = RFIFOW(fd,2) - 4;
-	mes = RFIFOP(fd,4);
+	mes = (char*)RFIFOP(fd,4);
 	mes_len_check(mes, len, CHAT_SIZE);
 
 	WBUFW(buf,0) = 0x9a;
@@ -10149,7 +10149,7 @@ void clif_parse_PartyMessage(int fd, struct map_session_data *sd)
 	int len;
 
 	len = RFIFOW(fd,2) - 4;
-	mes = RFIFOP(fd,4);
+	mes = (char*)RFIFOP(fd,4);
 	mes_len_check(mes, len, CHAT_SIZE);
 
 	if (is_charcommand(fd, sd, mes) != CharCommand_None ||
@@ -10333,7 +10333,7 @@ void clif_parse_GuildChangeNotice(int fd,struct map_session_data *sd)
 	}
 	// compensate for the client's adding of an extra space at the end of the message
 	if (RFIFOB(fd, 66) == '|') {
-		memset(RFIFOP(fd, 66 + strnlen(RFIFOP(fd, 66), 120)-1), 0x00, 1); // delete extra space at the end
+		memset(RFIFOP(fd, 66 + strnlen((char*)RFIFOP(fd, 66), 120)-1), 0x00, 1); // delete extra space at the end
 	}
 
 	guild_change_notice(sd,RFIFOL(fd,2),(char*)RFIFOP(fd,6),(char*)RFIFOP(fd,66));
@@ -10406,7 +10406,7 @@ void clif_parse_GuildMessage(int fd,struct map_session_data *sd)
 	int len;
 
 	len = RFIFOW(fd,2) - 4;
-	mes = RFIFOP(fd,4);
+	mes = (char*)RFIFOP(fd,4);
 	mes_len_check(mes, len, CHAT_SIZE);
 
 	if (is_charcommand(fd, sd, mes) != CharCommand_None ||
@@ -10611,7 +10611,7 @@ void clif_parse_Shift(int fd, struct map_session_data *sd)
 	if (pc_isGM(sd) < (lv=get_atcommand_level(AtCommand_JumpTo)))
 		return;
 
-	player_name = RFIFOP(fd,2);
+	player_name = (char*)RFIFOP(fd,2);
 	player_name[NAME_LENGTH-1] = '\0';
 	atcommand_jumpto(fd, sd, "@jumpto", player_name); // as @jumpto
 	if(log_config.gm && lv >= log_config.gm) {
@@ -10636,7 +10636,7 @@ void clif_parse_Recall(int fd, struct map_session_data *sd)
 	if (pc_isGM(sd) < (lv=get_atcommand_level(AtCommand_Recall)))
 		return;
 
-	player_name = RFIFOP(fd,2);
+	player_name = (char*)RFIFOP(fd,2);
 	player_name[NAME_LENGTH-1] = '\0';
 	atcommand_recall(fd, sd, "@recall", player_name); // as @recall
 	if(log_config.gm && lv >= log_config.gm) {
@@ -10659,7 +10659,7 @@ void clif_parse_GM_Monster_Item(int fd, struct map_session_data *sd)
 	if (battle_config.atc_gmonly && !pc_isGM(sd))
 		return;
 
-	monster_item_name = RFIFOP(fd,2);
+	monster_item_name = (char*)RFIFOP(fd,2);
 	monster_item_name[NAME_LENGTH-1] = '\0';
 
 	if (mobdb_searchname(monster_item_name)) {
@@ -11421,7 +11421,7 @@ void clif_parse_AdoptRequest(int fd,struct map_session_data *sd)
  *------------------------------------------*/
 void clif_parse_ChangeHomunculusName(int fd, struct map_session_data *sd)
 {
-	merc_hom_change_name(sd,RFIFOP(fd,2));
+	merc_hom_change_name(sd,(char*)RFIFOP(fd,2));
 }
 
 void clif_parse_HomMoveToMaster(int fd, struct map_session_data *sd)

src/map/intif.c

@@ -293,8 +293,8 @@ int intif_saveregistry(struct map_session_data *sd, int type)
 		int i,p;
 		for (p=13,i = 0; i < count; i++) {
 			if (reg[i].str[0] && reg[i].value != 0) {
-				p+= sprintf(WFIFOP(inter_fd,p), "%s", reg[i].str)+1; //We add 1 to consider the '\0' in place.
-				p+= sprintf(WFIFOP(inter_fd,p), "%s", reg[i].value)+1;
+				p+= sprintf((char*)WFIFOP(inter_fd,p), "%s", reg[i].str)+1; //We add 1 to consider the '\0' in place.
+				p+= sprintf((char*)WFIFOP(inter_fd,p), "%s", reg[i].value)+1;
 			}
 		}
 		WFIFOW(inter_fd,2)=p;
@@ -971,10 +971,10 @@ int intif_parse_Registers(int fd)
 			return 0;
 	}
 	for(j=0,p=13;j<max && p<RFIFOW(fd,2);j++){
-		sscanf(RFIFOP(fd,p), "%31c%n", reg[j].str,&len);
+		sscanf((char*)RFIFOP(fd,p), "%31c%n", reg[j].str,&len);
 		reg[j].str[len]='\0';
 		p += len+1; //+1 to skip the '\0' between strings.
-		sscanf(RFIFOP(fd,p), "%255c%n", reg[j].value,&len);
+		sscanf((char*)RFIFOP(fd,p), "%255c%n", reg[j].value,&len);
 		reg[j].value[len]='\0';
 		p += len+1;
 	}
@@ -1399,10 +1399,10 @@ int intif_parse_ChangeNameOk(int fd)
 	case 0: //Players [NOT SUPPORTED YET]
 		break;
 	case 1: //Pets
-		pet_change_name_ack(sd, RFIFOP(fd,12), RFIFOB(fd,11));
+		pet_change_name_ack(sd, (char*)RFIFOP(fd,12), RFIFOB(fd,11));
 		break;
 	case 2: //Hom
-		merc_hom_change_name_ack(sd, RFIFOP(fd,12), RFIFOB(fd,11));
+		merc_hom_change_name_ack(sd, (char*)RFIFOP(fd,12), RFIFOB(fd,11));
 		break;
 	}
 	return 0;

src/map/irc.c

@@ -39,7 +39,7 @@ char irc_channel[32]="";
 char irc_channel_pass[32]="";
 char irc_trade_channel[32]="";
 
-unsigned char irc_ip_str[128]="";
+char irc_ip_str[128]="";
 unsigned long irc_ip=0;
 unsigned short irc_port = 6667;
 int irc_fd=0;

src/map/npc.h

@@ -17,8 +17,8 @@
 #define npcdb_checkid(id) ((id >=  46 && id <= 125) || id == 139 || (id >= 700 && id <= MAX_NPC_CLASS) || id == INVISIBLE_CLASS)
 
 #ifdef PCRE_SUPPORT
-void npc_chat_finalize(struct npc_data *nd);
-int mob_chat_sub(struct block_list *bl, va_list ap);
+void npc_chat_finalize(struct npc_data* nd);
+int mob_chat_sub(struct block_list* bl, va_list ap);
 #endif
 
 //Script NPC events.
@@ -34,32 +34,32 @@ enum {
 	NPCE_MAX
 };
 struct view_data* npc_get_viewdata(int class_);
-int npc_chat_sub(struct block_list *bl, va_list ap);
-int npc_event_dequeue(struct map_session_data *sd);
-int npc_event_timer(int tid,unsigned int tick,int id,int data);
-int npc_event(struct map_session_data *sd, const unsigned char *eventname, int mob_kill);
-int npc_timer_event(const unsigned char *eventname);				// Added by RoVeRT
+int npc_chat_sub(struct block_list* bl, va_list ap);
+int npc_event_dequeue(struct map_session_data* sd);
+int npc_event_timer(int tid,unsigned int tick, int id, int data);
+int npc_event(struct map_session_data* sd, const char* eventname, int mob_kill);
+int npc_timer_event(const char* eventname); // Added by RoVeRT
 int npc_command(struct map_session_data* sd, const char* npcname, const char* command);
-int npc_touch_areanpc(struct map_session_data *,int,int,int);
-int npc_touch_areanpc2(struct block_list *bl); // [Skotlex]
-int npc_check_areanpc(int flag,int m,int x,int y,int range);
-int npc_click(struct map_session_data *sd,struct npc_data *nd);
-int npc_scriptcont(struct map_session_data *,int);
-TBL_NPC *npc_checknear(struct map_session_data *sd,struct block_list *bl);
-int npc_checknear2(struct map_session_data *sd,struct block_list *bl);
-int npc_buysellsel(struct map_session_data *,int,int);
-int npc_buylist(struct map_session_data *,int,unsigned short *);
-int npc_selllist(struct map_session_data *,int,unsigned short *);
-int npc_parse_mob(char *w1,char *w2,char *w3,char *w4);
-int npc_parse_mob2 (struct spawn_data*, int index); // [Wizputer]
-int npc_parse_warp(char *w1,char *w2,char *w3,char *w4);
-int npc_globalmessage(const char *name,const char *mes);
+int npc_touch_areanpc(struct map_session_data* sd, int m, int x, int y);
+int npc_touch_areanpc2(struct block_list* bl); // [Skotlex]
+int npc_check_areanpc(int flag, int m, int x, int y, int range);
+int npc_click(struct map_session_data* sd, struct npc_data* nd);
+int npc_scriptcont(struct map_session_data* sd, int id);
+TBL_NPC* npc_checknear(struct map_session_data* sd, struct block_list* bl);
+int npc_checknear2(struct map_session_data* sd, struct block_list* bl);
+int npc_buysellsel(struct map_session_data* sd, int id, int type);
+int npc_buylist(struct map_session_data* sd,int n, unsigned short* item_list);
+int npc_selllist(struct map_session_data* sd, int n, unsigned short* item_list);
+int npc_parse_mob(char* w1, char* w2, char* w3, char* w4);
+int npc_parse_mob2(struct spawn_data* mob, int index); // [Wizputer]
+int npc_parse_warp(char* w1,char* w2,char* w3,char* w4);
+int npc_globalmessage(const char* name,const char* mes);
 
-void npc_setcells(struct npc_data *nd);
-void npc_movenpc(struct npc_data *nd, int x, int y);
-int npc_enable(const char *name,int flag);
-int npc_changename(const char *name, const char *newname, short look); // [Lance]
-struct npc_data* npc_name2id(const char *name);
+void npc_setcells(struct npc_data* nd);
+void npc_movenpc(struct npc_data* nd, int x, int y);
+int npc_enable(const char* name, int flag);
+int npc_changename(const char* name, const char* newname, short look); // [Lance]
+struct npc_data* npc_name2id(const char* name);
 
 int npc_get_new_npc_id(void);
 
@@ -69,20 +69,20 @@ void npc_parsesrcfile(const char* name);
 int do_final_npc(void);
 int do_init_npc(void);
 int npc_event_do_oninit(void);
-int npc_do_ontimer(int,int);
+int npc_do_ontimer(int npc_id, int option);
 
-int npc_event_doall(const unsigned char *name);
-int npc_event_do(const unsigned char *name);
-int npc_event_doall_id(const unsigned char *name, int id);
+int npc_event_doall(const char* name);
+int npc_event_do(const char* name);
+int npc_event_doall_id(const char* name, int id);
 
-int npc_timerevent_start(struct npc_data *nd, int rid);
-int npc_timerevent_stop(struct npc_data *nd);
-void npc_timerevent_quit(struct map_session_data *sd);
-int npc_gettimerevent_tick(struct npc_data *nd);
-int npc_settimerevent_tick(struct npc_data *nd,int newtimer);
-int npc_remove_map(struct npc_data *nd);
-void npc_unload_duplicates (struct npc_data *nd);
-int npc_unload(struct npc_data *nd);
+int npc_timerevent_start(struct npc_data* nd, int rid);
+int npc_timerevent_stop(struct npc_data* nd);
+void npc_timerevent_quit(struct map_session_data* sd);
+int npc_gettimerevent_tick(struct npc_data* nd);
+int npc_settimerevent_tick(struct npc_data* nd, int newtimer);
+int npc_remove_map(struct npc_data* nd);
+void npc_unload_duplicates (struct npc_data* nd);
+int npc_unload(struct npc_data* nd);
 int npc_reload(void);
 void npc_read_event_script(void);
 int npc_script_event(TBL_PC* sd, int type);

src/map/script.c

@@ -363,7 +363,7 @@ static void check_event(struct script_state *st, const char *evt)
  * 文字列のハッシュを計算
  *------------------------------------------*/
 #define calc_hash(x) (calc_hash2(x)%SCRIPT_HASH_SIZE)
-static unsigned int calc_hash2(const unsigned char *p)
+static unsigned int calc_hash2(const char* p)
 {
 #if defined(SCRIPT_HASH_DJB2)
 	unsigned int h = 5381;
@@ -2862,7 +2862,7 @@ void run_script_main(struct script_state *st)
 			push_val(stack,c,0);
 			break;
 		case C_STR:
-			push_str(stack,C_CONSTSTR,(st->script->script_buf+st->pos));
+			push_str(stack,C_CONSTSTR,(char*)(st->script->script_buf+st->pos));
 			while(st->script->script_buf[st->pos++]);
 			break;
 		case C_FUNC:
@@ -4553,7 +4553,7 @@ BUILDIN_FUNC(callfunc)
 	struct script_code *scr, *oldscr;
 	const char *str=script_getstr(st,2);
 
-	if( (scr=strdb_get(userfunc_db,(unsigned char*)str)) ){
+	if( (scr = strdb_get(userfunc_db, str)) ){
 		int i,j;
 		struct linkdb_node **oldval = st->stack->var_function;
 		for(i=st->start+3,j=0;i<st->end;i++,j++)
@@ -10258,7 +10258,7 @@ BUILDIN_FUNC(petloot)
 BUILDIN_FUNC(getinventorylist)
 {
 	TBL_PC *sd=script_rid2sd(st);
-	unsigned char card_var[NAME_LENGTH];
+	char card_var[NAME_LENGTH];
 	
 	int i,j=0,k;
 	if(!sd) return 0;

src/map/skill.c

@@ -2442,7 +2442,7 @@ static int skill_check_condition_hom (struct homun_data *hd, int skill, int lv,
 				return 0;
 			break;
 		case HVAN_EXPLOSION:
-			if(hd->homunculus.intimacy < battle_config.hvan_explosion_intimate)
+			if(hd->homunculus.intimacy < (unsigned int)battle_config.hvan_explosion_intimate)
 				return 0;
 			break;
 	}
@@ -6115,7 +6115,7 @@ int skill_castend_pos2 (struct block_list *src, int x, int y, int skillid, int s
 	case WZ_METEOR:
 		{
 			int flag=0, area = skill_get_splash(skillid, skilllv);
-			short tmpx, tmpy, x1 = 0, y1 = 0;
+			short tmpx = 0, tmpy = 0, x1 = 0, y1 = 0;
 			if (sc && sc->data[SC_MAGICPOWER].timer != -1)
 				flag = flag|2; //Store the magic power flag for future use. [Skotlex]
 			for(i=0;i<2+(skilllv>>1);i++) {