summaryrefslogtreecommitdiff
path: root/src/map/script.h
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2019-03-11 00:56:49 +0100
committerGitHub <noreply@github.com>2019-03-11 00:56:49 +0100
commit47cfee479ebf61942be2af9540013469d6806f13 (patch)
treeba5958cdd3893c0bf1a2e43cd6f53de2d34768e6 /src/map/script.h
parent28eb50882484697b10fa4764b3e0fd91d9e12a4e (diff)
parent0d99c3487f4efa10407879112ad0db24be86d5ff (diff)
downloadhercules-47cfee479ebf61942be2af9540013469d6806f13.tar.gz
hercules-47cfee479ebf61942be2af9540013469d6806f13.tar.bz2
hercules-47cfee479ebf61942be2af9540013469d6806f13.tar.xz
hercules-47cfee479ebf61942be2af9540013469d6806f13.zip
Merge pull request #2397 from AnnieRuru/68-getmercinfo
Add constants and MERCINFO_GID to *getmercinfo script command
Diffstat (limited to 'src/map/script.h')
-rw-r--r--src/map/script.h17
1 files changed, 17 insertions, 0 deletions
diff --git a/src/map/script.h b/src/map/script.h
index 549ad3284..54c5aad2a 100644
--- a/src/map/script.h
+++ b/src/map/script.h
@@ -461,6 +461,23 @@ enum script_iteminfo_types {
};
/**
+ * Mercenary Info types.
+ */
+enum script_mercinfo_types {
+ MERCINFO_ID = 0,
+ MERCINFO_CLASS,
+ MERCINFO_NAME,
+ MERCINFO_FAITH,
+ MERCINFO_CALLS,
+ MERCINFO_KILLCOUNT,
+ MERCINFO_LIFETIME,
+ MERCINFO_LEVEL,
+ MERCINFO_GID,
+
+ MERCINFO_MAX
+};
+
+/**
* Player blocking actions related flags.
*/
enum pcblock_action_flag {