Split monster goal coordinate out of mstrategy field

Instead of packing a coordinate into unsigned long, store the goal in
a coord struct, making the code a bit cleaner.  Monster struct is
of course slightly bigger, but that should not really matter.
No change in monster behaviour.

Breaks saves and bones.
This commit is contained in:
Pasi Kallinen
2025-02-16 10:35:17 +02:00
parent 8672807a5e
commit 3cb7819c81
4 changed files with 21 additions and 18 deletions

View File

@@ -180,12 +180,10 @@ struct monst {
#define STRAT_PLAYER 0x01000000L
#define STRAT_NONE 0x00000000L
#define STRAT_STRATMASK 0x0f000000L
#define STRAT_XMASK 0x00ff0000L
#define STRAT_YMASK 0x0000ff00L
/* mstrategy unused 0x00ffff00L */
#define STRAT_GOAL 0x000000ffL
#define STRAT_GOALX(s) ((coordxy) ((s & STRAT_XMASK) >> 16))
#define STRAT_GOALY(s) ((coordxy) ((s & STRAT_YMASK) >> 8))
coord mgoal; /* monster strategy, target location */
long mtrapseen; /* bitmap of traps we've been trapped in */
long mlstmv; /* for catching up with lost time */
long mstate; /* debugging info on monsters stored here */

View File

@@ -17,7 +17,7 @@
* Incrementing EDITLEVEL can be used to force invalidation of old bones
* and save files.
*/
#define EDITLEVEL 119
#define EDITLEVEL 120
/*
* Development status possibilities.