Fixes some compiler warnings on GCC

Partially fixes #1171 as a follow up to 2bf64c9.
rathena · Apr 14, 2016 · 7264099 · 7264099
1 parent a41ba12
commit 7264099
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 26 deletions.
diff --git a/src/map/pc.c b/src/map/pc.c
@@ -63,6 +63,33 @@ struct fame_list taekwon_fame_list[MAX_FAME_LIST];
 #define MOTD_LINE_SIZE 128
 static char motd_text[MOTD_LINE_SIZE][CHAT_SIZE_MAX]; // Message of the day buffer [Valaris]
 
+/**
+ * Translation table from athena equip index to aegis bitmask
+*/
+unsigned int equip_bitmask[EQI_MAX] = {
+	EQP_ACC_L,				// EQI_ACC_L
+	EQP_ACC_R,				// EQI_ACC_R
+	EQP_SHOES,				// EQI_SHOES
+	EQP_GARMENT,			// EQI_GARMENT
+	EQP_HEAD_LOW,			// EQI_HEAD_LOW
+	EQP_HEAD_MID,			// EQI_HEAD_MID
+	EQP_HEAD_TOP,			// EQI_HEAD_TOP
+	EQP_ARMOR,				// EQI_ARMOR
+	EQP_HAND_L,				// EQI_HAND_L
+	EQP_HAND_R,				// EQI_HAND_R
+	EQP_COSTUME_HEAD_TOP,	// EQI_COSTUME_HEAD_TOP
+	EQP_COSTUME_HEAD_MID,	// EQI_COSTUME_HEAD_MID
+	EQP_COSTUME_HEAD_LOW,	// EQI_COSTUME_HEAD_LOW
+	EQP_COSTUME_GARMENT,	// EQI_COSTUME_GARMENT
+	EQP_AMMO,				// EQI_AMMO
+	EQP_SHADOW_ARMOR,		// EQI_SHADOW_ARMOR
+	EQP_SHADOW_WEAPON,		// EQI_SHADOW_WEAPON
+	EQP_SHADOW_SHIELD,		// EQI_SHADOW_SHIELD
+	EQP_SHADOW_SHOES,		// EQI_SHADOW_SHOES
+	EQP_SHADOW_ACC_R,		// EQI_SHADOW_ACC_R
+	EQP_SHADOW_ACC_L		// EQI_SHADOW_ACC_L
+};
+
 //Links related info to the sd->hate_mob[]/sd->feel_map[] entries
 const struct sg_data sg_info[MAX_PC_FEELHATE] = {
 		{ SG_SUN_ANGER, SG_SUN_BLESS, SG_SUN_COMFORT, "PC_FEEL_SUN", "PC_HATE_MOB_SUN", is_day_of_sun },

diff --git a/src/map/pc.h b/src/map/pc.h
@@ -68,32 +68,7 @@ enum equip_index {
 	EQI_MAX
 };
 
-/**
- * Translation table from athena equip index to aegis bitmask
-*/
-static unsigned int equip_bitmask[EQI_MAX] = {
-	EQP_ACC_L,				// EQI_ACC_L
-	EQP_ACC_R,				// EQI_ACC_R
-	EQP_SHOES,				// EQI_SHOES
-	EQP_GARMENT,			// EQI_GARMENT
-	EQP_HEAD_LOW,			// EQI_HEAD_LOW
-	EQP_HEAD_MID,			// EQI_HEAD_MID
-	EQP_HEAD_TOP,			// EQI_HEAD_TOP
-	EQP_ARMOR,				// EQI_ARMOR
-	EQP_HAND_L,				// EQI_HAND_L
-	EQP_HAND_R,				// EQI_HAND_R
-	EQP_COSTUME_HEAD_TOP,	// EQI_COSTUME_HEAD_TOP
-	EQP_COSTUME_HEAD_MID,	// EQI_COSTUME_HEAD_MID
-	EQP_COSTUME_HEAD_LOW,	// EQI_COSTUME_HEAD_LOW
-	EQP_COSTUME_GARMENT,	// EQI_COSTUME_GARMENT
-	EQP_AMMO,				// EQI_AMMO
-	EQP_SHADOW_ARMOR,		// EQI_SHADOW_ARMOR
-	EQP_SHADOW_WEAPON,		// EQI_SHADOW_WEAPON
-	EQP_SHADOW_SHIELD,		// EQI_SHADOW_SHIELD
-	EQP_SHADOW_SHOES,		// EQI_SHADOW_SHOES
-	EQP_SHADOW_ACC_R,		// EQI_SHADOW_ACC_R
-	EQP_SHADOW_ACC_L		// EQI_SHADOW_ACC_L
-};
+extern unsigned int equip_bitmask[EQI_MAX];
 
 #define equip_index_check(i) ( (i) >= EQI_ACC_L && (i) < EQI_MAX )