Changeset 819 for trunk/src/xtra2.c

Timestamp:

03/26/08 12:57:49 (2 years ago)

Author:

ajps

Message:

Revised the way mouse click targetting works to fix #326 and #327 - it
should now actually be possible to target and look around using clicks.

New behaviour is that first click moves the cursor and 'looks', another
click in the place highlighted carries out the action (setting target,
launching projectile, whatever). Clicks on monsters target monsters,
otherwise the grid is targetted.

Files:

• trunk/src/xtra2.c (modified) (3 diffs)

trunk/src/xtra2.c

@@ -1961 +1961 @@
                 else
                 {
-                        p = "Direction ('5' or <click> for target, '*' to re-target, Escape to cancel)? ";
+                        p = "Direction ('5' for target, '*' or <click> to re-target, Escape to cancel)? ";
                 }
 
@@ -1973 +1973 @@
                         case '\xff':
                         {
-                                target_set_location(ke.mousey + Term->offset_y, ke.mousex + Term->offset_x);
-                                dir = 5;
+                                if (target_set_interactive(TARGET_KILL, KEY_GRID_X(ke), KEY_GRID_Y(ke)))
+                                        dir = 5;
+
                                 break;
                         }
@@ -1981 +1982 @@
                         case '*':
                         {
-                                if (target_set_interactive(TARGET_KILL)) dir = 5;
+                                if (target_set_interactive(TARGET_KILL, -1, -1)) dir = 5;
                                 break;
                         }