- Some minor cleanups.

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

src/char_sql/int_guild.c

@@ -411,10 +411,12 @@ struct guild * inter_guild_fromsql(int guild_id)
 	strncpy(g->master,sql_row[1],NAME_LENGTH-1);
 	g->guild_lv=atoi(sql_row[2]);
 	g->connect_member=atoi(sql_row[3]);
-	if (atoi(sql_row[4]) > MAX_GUILD) // Fix reduction of MAX_GUILD [PoW]
+	g->max_member = atoi(sql_row[4]);
+	if (g->max_member > MAX_GUILD)
+	{	// Fix reduction of MAX_GUILD [PoW]
+		ShowWarning("Guild %d:%s specifies higher capacity (%d) than MAX_GUILD (%d)\n", guild_id, g->name, g->max_member, MAX_GUILD);
 		g->max_member = MAX_GUILD;
-	else
-		g->max_member = atoi(sql_row[4]);
+	}
 	g->average_lv=atoi(sql_row[5]);
 	g->exp=(unsigned int)atof(sql_row[6]);
 	g->next_exp=(unsigned int)atof(sql_row[7]);

src/map/skill.c

@@ -8343,7 +8343,7 @@ int skill_check_condition (struct map_session_data *sd, int skill, int lv, int t
 			return 0;
 		}
 		if(ammo) { //Skill requires stuff equipped in the arrow slot.
-			if((i=sd->equip_index[10]) < 0 ||
+			if((i=sd->equip_index[EQI_AMMO]) < 0 ||
 				!sd->inventory_data[i] ||
 				sd->status.inventory[i].amount < ammo_qty
 			) {