summaryrefslogtreecommitdiff
path: root/src/map/instance.h
diff options
context:
space:
mode:
authorgreenboxal2 <greenboxal2@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-11-25 21:20:43 +0000
committergreenboxal2 <greenboxal2@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-11-25 21:20:43 +0000
commitb11bf6e1604097711291265f927e79e8f2af5c54 (patch)
tree6eac67dfe94b2cef4e48f59c1bf448a321ce24cd /src/map/instance.h
parentd9c5c4784a0abc43fb9e01f365a0d8b3a15a0692 (diff)
downloadhercules-b11bf6e1604097711291265f927e79e8f2af5c54.tar.gz
hercules-b11bf6e1604097711291265f927e79e8f2af5c54.tar.bz2
hercules-b11bf6e1604097711291265f927e79e8f2af5c54.tar.xz
hercules-b11bf6e1604097711291265f927e79e8f2af5c54.zip
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
Diffstat (limited to 'src/map/instance.h')
-rw-r--r--src/map/instance.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/map/instance.h b/src/map/instance.h
index f8f7387f7..cfb1d0b77 100644
--- a/src/map/instance.h
+++ b/src/map/instance.h
@@ -12,22 +12,22 @@
typedef enum instance_state { INSTANCE_FREE, INSTANCE_IDLE, INSTANCE_BUSY } instance_state;
struct s_instance {
- char name[INSTANCE_NAME_LENGTH]; // Instance Name - required for clif functions.
- instance_state state;
- short instance_id;
- int party_id;
-
- int map[MAX_MAP_PER_INSTANCE];
- int num_map;
- int users;
-
- struct DBMap* vars; // Instance Variable for scripts
-
- int progress_timer;
- time_t progress_timeout;
-
- int idle_timer;
- time_t idle_timeout, idle_timeoutval;
+ char name[INSTANCE_NAME_LENGTH]; // Instance Name - required for clif functions.
+ instance_state state;
+ short instance_id;
+ int party_id;
+
+ int map[MAX_MAP_PER_INSTANCE];
+ int num_map;
+ int users;
+
+ struct DBMap *vars; // Instance Variable for scripts
+
+ int progress_timer;
+ time_t progress_timeout;
+
+ int idle_timer;
+ time_t idle_timeout, idle_timeoutval;
};
extern int instance_start;