Commented out msg_athena.conf strings disabled in r11625.

Reverted changes in r11625 that used enum sc_type where it shouldn't have been used.
Removed leftover npc/other/arena.txt.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11627 54d463be-8e91-2dee-dedb-b68131a5f0ec

4 files changed, 18 insertions, 10 deletions

diff --git a/src/map/clif.c b/src/map/clif.c
index d5eec4f56..1d254cf8d 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -7626,7 +7626,7 @@ void clif_feel_hate_reset(struct map_session_data *sd)
 	WFIFOSET(fd, packet_len(0x20e));
 }
 
-/// Validates one global/guild/party/whisper message packet to and tries to recognize its components.
+/// Validates one global/guild/party/whisper message packet and tries to recognize its components.
 /// Returns true if the packet was parsed successfully.
 /// Formats: 0 - <packet id>.w <packet len>.w (<name> : <message>).?B 00
 ///          1 - <packet id>.w <packet len>.w <name>.24B <message>.?B 00
diff --git a/src/map/pet.c b/src/map/pet.c
index 606e29d31..64424d7f1 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -1359,7 +1359,8 @@ int do_init_pet(void)
 	return 0;
 }
 
-int do_final_pet(void) {
+int do_final_pet(void)
+{
 	int i;
 	for( i = 0; i < MAX_PET_DB; i++ ) {
 		if(pet_db[i].script) {
diff --git a/src/map/status.c b/src/map/status.c
index 75c877140..6919a47bb 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -6100,11 +6100,15 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
 }
 /*==========================================
  * ステータス異常全解除
+ * type:
+ * 0 - ???
+ * 1 - ???
+ * 2 - ???
  *------------------------------------------*/
-int status_change_clear(struct block_list* bl, enum sc_type type)
+int status_change_clear(struct block_list* bl, int type)
 {
 	struct status_change* sc;
-	int i;
+	enum sc_type i;
 
 	sc = status_get_sc(bl);
 
@@ -6118,9 +6122,10 @@ int status_change_clear(struct block_list* bl, enum sc_type type)
 	{
 		if(sc->data[i].timer == -1)
 		  continue;
+
 		if(type == 0)
 		switch (i)
-		{	//Type 0: PC killed -> Place here stats that do not dispel on death.
+		{	//Type 0: PC killed -> Place here statuses that do not dispel on death.
 		case SC_EDP:
 		case SC_MELTDOWN:
 		case SC_XMAS:
@@ -6136,6 +6141,7 @@ int status_change_clear(struct block_list* bl, enum sc_type type)
 		case SC_JAILED:
 			continue;
 		}
+
 		status_change_end(bl, i, INVALID_TIMER);
 
 		if( type == 1 && sc->data[i].timer != INVALID_TIMER )
@@ -6145,12 +6151,13 @@ int status_change_clear(struct block_list* bl, enum sc_type type)
 			sc->data[i].timer = -1;
 		}
 	}
+
 	sc->opt1 = 0;
 	sc->opt2 = 0;
 	sc->opt3 = 0;
 	sc->option &= OPTION_MASK;
 
-	if(!type || type&2)
+	if( type == 0 || type == 2 )
 		clif_changeoption(bl);
 
 	return 1;
@@ -7025,9 +7032,9 @@ int status_change_timer_sub(struct block_list* bl, va_list ap)
  * Clears buffs/debuffs of a character.
  * type&1 -> buffs, type&2 -> debuffs
  *------------------------------------------*/
-int status_change_clear_buffs (struct block_list* bl, enum sc_type type)
+int status_change_clear_buffs (struct block_list* bl, int type)
 {
-	int i;
+	enum sc_type i;
 	struct status_change *sc= status_get_sc(bl);
 
 	if (!sc || !sc->count)
diff --git a/src/map/status.h b/src/map/status.h
index 074425de6..a610ed120 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -670,8 +670,8 @@ int status_change_end(struct block_list* bl, enum sc_type type, int tid);
 int kaahi_heal_timer(int tid, unsigned int tick, int id, int data);
 int status_change_timer(int tid, unsigned int tick, int id, int data);
 int status_change_timer_sub(struct block_list* bl, va_list ap);
-int status_change_clear(struct block_list* bl, enum sc_type type);
-int status_change_clear_buffs(struct block_list* bl, enum sc_type type);
+int status_change_clear(struct block_list* bl, int type);
+int status_change_clear_buffs(struct block_list* bl, int type);
 
 void status_calc_bl(struct block_list *bl, unsigned long flag);
 int status_calc_pet(struct pet_data* pd, int first); // [Skotlex]