- Fixed item script of Chicken_Hat (5431). (bugreport:4174)

- Fixed a typo in script_commands.txt (bugreport:4270)
- Fixed some links in the README html files.
- Fixed the range of 'max_guild_alliance' in battle.c (0 to 3).
- Set svn:eol-style=native for some recently added text files.

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

1 files changed, 48 insertions, 48 deletions

diff --git a/src/map/instance.h b/src/map/instance.h
index f9fa87dc3..c663503f5 100644
--- a/src/map/instance.h
+++ b/src/map/instance.h
@@ -1,48 +1,48 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL

-// For more information, see LICENCE in the main folder

-

-#ifndef _INSTANCE_H_

-#define _INSTANCE_H_

-

-#define MAX_MAP_PER_INSTANCE 10

-#define MAX_INSTANCE 500

-

-typedef enum instance_state { INSTANCE_FREE, INSTANCE_IDLE, INSTANCE_BUSSY } instance_state;

-

-struct s_instance {

-	char name[61]; // 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 linkdb_node *ivar, *svar; // Instance Variable for scripts

-	

-	int progress_timer;

-	time_t progress_timeout, progress_timeoutval;

-

-	int idle_timer;

-	time_t idle_timeout, idle_timeoutval;

-};

-

-extern int instance_start;

-extern struct s_instance instance[MAX_INSTANCE];

-

-int instance_create(int party_id, const char *name);

-int instance_add_map(const char *name, int instance_id, bool usebasename);

-void instance_del_map(int m);

-int instance_map2imap(int m, int instance_id);

-int instance_mapid2imapid(int m, int instance_id);

-void instance_destroy(int instance_id);

-void instance_init(int instance_id);

-

-void instance_check_idle(int instance_id);

-void instance_check_kick(struct map_session_data *sd);

-void instance_set_timeout(int instance_id, unsigned int progress_timeout, unsigned int idle_timeout);

-

-void do_init_instance();

-

-#endif

+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#ifndef _INSTANCE_H_
+#define _INSTANCE_H_
+
+#define MAX_MAP_PER_INSTANCE 10
+#define MAX_INSTANCE 500
+
+typedef enum instance_state { INSTANCE_FREE, INSTANCE_IDLE, INSTANCE_BUSSY } instance_state;
+
+struct s_instance {
+	char name[61]; // 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 linkdb_node *ivar, *svar; // Instance Variable for scripts
+	
+	int progress_timer;
+	time_t progress_timeout, progress_timeoutval;
+
+	int idle_timer;
+	time_t idle_timeout, idle_timeoutval;
+};
+
+extern int instance_start;
+extern struct s_instance instance[MAX_INSTANCE];
+
+int instance_create(int party_id, const char *name);
+int instance_add_map(const char *name, int instance_id, bool usebasename);
+void instance_del_map(int m);
+int instance_map2imap(int m, int instance_id);
+int instance_mapid2imapid(int m, int instance_id);
+void instance_destroy(int instance_id);
+void instance_init(int instance_id);
+
+void instance_check_idle(int instance_id);
+void instance_check_kick(struct map_session_data *sd);
+void instance_set_timeout(int instance_id, unsigned int progress_timeout, unsigned int idle_timeout);
+
+void do_init_instance();
+
+#endif