diff options
author | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-05 02:53:33 +0000 |
---|---|---|
committer | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-05 02:53:33 +0000 |
commit | 60a426c0742b3e7d8c5b557c7578df6eeeea377b (patch) | |
tree | 5d01f9ccc2798309f9b13f07c0096ed97c6a85c8 /src/map/instance.h | |
parent | 621db2441f69736a6c8f10d26bf966d5414fac74 (diff) | |
download | hercules-60a426c0742b3e7d8c5b557c7578df6eeeea377b.tar.gz hercules-60a426c0742b3e7d8c5b557c7578df6eeeea377b.tar.bz2 hercules-60a426c0742b3e7d8c5b557c7578df6eeeea377b.tar.xz hercules-60a426c0742b3e7d8c5b557c7578df6eeeea377b.zip |
- Undid r16968: SVN Replaced with source:/trunk/src/@16966 (tid:74924).
[16969:16991/trunk/src/] will be re-committed in the next 24 hours.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16992 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/instance.h')
-rw-r--r-- | src/map/instance.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/map/instance.h b/src/map/instance.h index cfb1d0b77..f8f7387f7 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; |