summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/enum.h
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-24 22:16:50 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-24 22:16:50 +0000
commit7ee1dfa39e789e7b631ff2883ee32b70b104a429 (patch)
tree384b9658812feaacf8951d6a12040e6d01f2f9b5 /crawl-ref/source/enum.h
parentdefa394ffdf8aac28836530ed7b31455a8059345 (diff)
downloadcrawl-ref-7ee1dfa39e789e7b631ff2883ee32b70b104a429.tar.gz
crawl-ref-7ee1dfa39e789e7b631ff2883ee32b70b104a429.zip
Apply patch 1952761 by jarpian (wasp): targetting with the monster list.
I've updated the patch to the current mlist code, but there are still a couple of bugs that will need to be ironed out. For example, monsters are picked by comparing their attitude and type, which is not sufficient in the case of (non-collapsed) zombies, as well as mimics or ghosts. Also if the number of monsters in the visible list is greater than its rows (because some appear in the same row) then monsters outside of the visible list can be targetted. I guess this is an unintended feature. :) I'm certain there'll be more bugs, though. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6129 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/enum.h')
-rw-r--r--crawl-ref/source/enum.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 9bc7585319..f9b3878b13 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -586,6 +586,9 @@ enum command_type
CMD_TARGET_CYCLE_FORWARD,
CMD_TARGET_CYCLE_BACK,
CMD_TARGET_CYCLE_BEAM,
+ CMD_TARGET_CYCLE_MLIST = 2000, // for indices a-z in the monster list
+ CMD_TARGET_CYCLE_MLIST_END = 2025,
+ CMD_TARGET_TOGGLE_MLIST,
CMD_TARGET_HIDE_BEAM,
CMD_TARGET_CENTER,
CMD_TARGET_CANCEL,
@@ -2796,6 +2799,15 @@ enum montravel_target_type
MTRAV_SUBMERSIBLE // Travelling to reach a submersible place.
};
+#ifndef USE_TILE
+enum mlist_targetting_type
+{
+ MLIST_TARGET_OFF = 0,
+ MLIST_TARGET_HIDDEN,
+ MLIST_TARGET_ON
+};
+#endif
+
#ifdef WIZARD
enum wizard_option_type