simulated mouse again
Change u.{dx,dy,dz} from schar to int and get rid of unused u.di.
Remove just added getdir_ok2click; it was declared as int but being
assigned booleans. Rename getloc_click to getdir_click and have
getdir() use it for both input and output.
A simulated mouse is becoming quite a nuisance for something which
will probably never be used by anyone in actual play.
This commit is contained in:
@@ -212,12 +212,14 @@ struct instance_flags {
|
||||
#define TER_OBJ 0x04
|
||||
#define TER_MON 0x08
|
||||
#define TER_DETECT 0x10 /* detect_foo magic rather than #terrain */
|
||||
boolean getloc_travelmode;
|
||||
int getdir_ok2click; /* for #therecmdmenu */
|
||||
int getloc_click; /* 0 or CLICK_1 (left) or CLICK_2 (right) */
|
||||
int getdir_click; /* as input to getdir(): non-zero, accept simulated
|
||||
* click that's not adjacent to or on hero;
|
||||
* as output from getdir(): simulated button used
|
||||
* 0 (none) or CLICK_1 (left) or CLICK_2 (right) */
|
||||
int getloc_filter; /* GFILTER_foo */
|
||||
boolean getloc_usemenu;
|
||||
boolean getloc_moveskip;
|
||||
boolean getloc_travelmode;
|
||||
boolean getloc_usemenu;
|
||||
coord travelcc; /* coordinates for travel_cache */
|
||||
boolean trav_debug; /* display travel path (#if DEBUG only) */
|
||||
boolean window_inited; /* true if init_nhwindows() completed */
|
||||
|
||||
@@ -347,17 +347,17 @@ enum utotypes {
|
||||
|
||||
/*** Information about the player ***/
|
||||
struct you {
|
||||
coordxy ux, uy; /* current map coordinates */
|
||||
schar dx, dy, dz; /* direction of move (or zap or ... ) */
|
||||
schar di; /* direction of FF */
|
||||
coordxy tx, ty; /* destination of travel */
|
||||
coordxy ux0, uy0; /* initial position FF */
|
||||
coordxy ux, uy; /* current map coordinates */
|
||||
int dx, dy, dz; /* x,y,z deltas; direction of move (or zap or ... )
|
||||
* usually +1 or 0 or -1 */
|
||||
coordxy tx, ty; /* destination of travel */
|
||||
coordxy ux0, uy0; /* previous ux,uy */
|
||||
d_level uz, uz0; /* your level on this and the previous turn */
|
||||
d_level utolev; /* level monster teleported you to, or uz */
|
||||
uchar utotype; /* bitmask of goto_level() flags for utolev */
|
||||
boolean umoved; /* changed map location (post-move) */
|
||||
int last_str_turn; /* 0: none, 1: half turn, 2: full turn
|
||||
+: turn right, -: turn left */
|
||||
* +: turn right, -: turn left */
|
||||
int ulevel; /* 1 to MAXULEV (30) */
|
||||
int ulevelmax; /* highest level, but might go down (to throttle
|
||||
* lost level recovery via blessed full healing) */
|
||||
|
||||
Reference in New Issue
Block a user