Changeset 819

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.

Location:

trunk/src

Files:

• cmd3.c (modified) (2 diffs)
• externs.h (modified) (1 diff)
• target.c (modified) (7 diffs)
• xtra2.c (modified) (3 diffs)

trunk/src/cmd3.c

@@ -489 +489 @@
 {
         /* Target set */
-        if (target_set_interactive(TARGET_KILL))
+        if (target_set_interactive(TARGET_KILL, -1, -1))
         {
                 msg_print("Target Selected.");
@@ -509 +509 @@
 {
         /* Look around */
-        if (target_set_interactive(TARGET_LOOK))
+        if (target_set_interactive(TARGET_LOOK, -1, -1))
         {
                 msg_print("Target Selected.");

trunk/src/externs.h

@@ -570 +570 @@
 void target_set_monster(int m_idx);
 void target_set_location(int y, int x);
-bool target_set_interactive(int mode);
+bool target_set_interactive(int mode, int x, int y);
 bool get_aim_dir(int *dp);
 void target_get(s16b *col, s16b *row);

trunk/src/target.c

@@ -495 +495 @@
 
         char out_val[256];
-
 
         /* Repeat forever */
@@ -920 +919 @@
  * This command will cancel any old target, even if used from
  * inside the "look" command.
- */
-bool target_set_interactive(int mode)
+ *
+ *
+ * 'mode' is one of TARGET_LOOK or TARGET_KILL.
+ * 'x' and 'y' are the initial position of the target to be highlighted,
+ * or -1 if no location is specified.
+ * Returns TRUE if a target has been successfully set, FALSE otherwise.
+ */
+bool target_set_interactive(int mode, int x, int y)
 {
-        int py = p_ptr->py;
-        int px = p_ptr->px;
-
         int i, d, m, t, bd;
 
-        int y = py;
-        int x = px;
-
         bool done = FALSE;
 
@@ -939 +938 @@
         char info[80];
 
+        /* If we haven't been given an initial location, start on the
+           player. */
+        if (x == -1 || y == -1)
+        {
+                x = p_ptr->px;
+                y = p_ptr->py;
+        }
+    /* If we /have/ been given an initial location, make sure we
+           honour it by going into "free targetting" mode. */
+        else
+        {
+                flag = FALSE;
+        }
 
         /* Cancel target */
@@ -1027 +1039 @@
                                         handle_stuff();
 
-                                        y = py;
-                                        x = px;
+                                        y = p_ptr->py;
+                                        x = p_ptr->px;
                                 }
 
@@ -1042 +1054 @@
                                 }
 
+                                /* If we click, move the target location to the click and
+                                   switch to "free targetting" mode by unsetting 'flag'.
+                                   This means we get some info about wherever we've picked. */
                                 case '\xff':
                                 {
-                                        x = query.mousex + Term->offset_x;
-                                        y = query.mousey + Term->offset_y;
-                                        target_set_location(y, x);
-                                        done = TRUE;
+                                        x = KEY_GRID_X(query);
+                                        y = KEY_GRID_Y(query);
+                                        flag = FALSE;
                                         break;
                                 }
@@ -1171 +1185 @@
                                         handle_stuff();
 
-                                        y = py;
-                                        x = px;
+                                        y = p_ptr->py;
+                                        x = p_ptr->px;
                                 }
 
@@ -1208 +1222 @@
                                 case '\xff':
                                 {
-                                        x = query.mousex + Term->offset_x;
-                                        y = query.mousey + Term->offset_y;
+                                        /* We only target if we click somewhere where the cursor
+                                           is already (i.e. a double-click without a time limit) */
+                                        if (KEY_GRID_X(query) == x && KEY_GRID_Y(query) == y)
+                                        {
+                                                /* Make an attempt to target the monster on the given
+                                                   square rather than the square itself (it seems this
+                                                   is the more likely intention of clicking on a 
+                                                   monster). */
+                                                int m_idx = cave_m_idx[y][x];
+
+                                                if ((m_idx > 0) && target_able(m_idx))
+                                                {
+                                                        health_track(m_idx);
+                                                        target_set_monster(m_idx);
+                                                }
+                                                else
+                                                {
+                                                        /* There is no monster, or it isn't targettable,
+                                                           so target the location instead. */
+                                                        target_set_location(y, x);
+                                                }
+
+                                                done = TRUE;
+                                        }
+                                        else
+                                        {
+                                                /* Just move the cursor for now - another click will
+                                                   target. */
+                                                x = KEY_GRID_X(query);
+                                                y = KEY_GRID_Y(query);
+                                        }
+                                        break;
                                 }
                                 case 't':

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;
                         }