Applied AStyle code formating as discussed on tid:74602.

Removed /SAFESEH option from MSVC11 projects.

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

1 files changed, 29 insertions, 29 deletions

diff --git a/src/map/mercenary.h b/src/map/mercenary.h
index 014bd8937..4de3f304e 100644
--- a/src/map/mercenary.h
+++ b/src/map/mercenary.h
@@ -11,46 +11,46 @@
 #define MAX_MER_DISTANCE 15
 
 enum {
-	ARCH_MERC_GUILD,
-	SPEAR_MERC_GUILD,
-	SWORD_MERC_GUILD,
+    ARCH_MERC_GUILD,
+    SPEAR_MERC_GUILD,
+    SWORD_MERC_GUILD,
 };
 
 struct s_mercenary_db {
-	int class_;
-	char sprite[NAME_LENGTH], name[NAME_LENGTH];
-	unsigned short lv;
-	short range2, range3;
-	struct status_data status;
-	struct view_data vd;
-	struct {
-		unsigned short id, lv;
-	} skill[MAX_MERCSKILL];
+    int class_;
+    char sprite[NAME_LENGTH], name[NAME_LENGTH];
+    unsigned short lv;
+    short range2, range3;
+    struct status_data status;
+    struct view_data vd;
+    struct {
+        unsigned short id, lv;
+    } skill[MAX_MERCSKILL];
 };
 
 extern struct s_mercenary_db mercenary_db[MAX_MERCENARY_CLASS];
 
 struct mercenary_data {
-	struct block_list bl;
-	struct unit_data ud;
-	struct view_data *vd;
-	struct status_data base_status, battle_status;
-	struct status_change sc;
-	struct regen_data regen;
-
-	struct s_mercenary_db *db;
-	struct s_mercenary mercenary;
-	char blockskill[MAX_SKILL];
-
-	struct map_session_data *master;
-	int contract_timer;
-	
-	unsigned devotion_flag : 1;
-	unsigned int masterteleport_timer;
+    struct block_list bl;
+    struct unit_data ud;
+    struct view_data *vd;
+    struct status_data base_status, battle_status;
+    struct status_change sc;
+    struct regen_data regen;
+
+    struct s_mercenary_db *db;
+    struct s_mercenary mercenary;
+    char blockskill[MAX_SKILL];
+
+    struct map_session_data *master;
+    int contract_timer;
+
+    unsigned devotion_flag : 1;
+    unsigned int masterteleport_timer;
 };
 
 bool merc_class(int class_);
-struct view_data * merc_get_viewdata(int class_);
+struct view_data *merc_get_viewdata(int class_);
 
 int merc_create(struct map_session_data *sd, int class_, unsigned int lifetime);
 int merc_data_received(struct s_mercenary *merc, bool flag);