| Revision | 6809603b5fc3217c3b41d8101ec08f9022e5b3f0 (tree) |
|---|---|
| Time | 2019-03-17 15:00:38 |
| Author | deskull <deskull@user...> |
| Commiter | deskull |
[Refactor] #38844 MFLAG_* M_FLAG2_* to type.h.
src/defines.h (diff)
src/spells2.c (diff) src/types.h (diff)| @@ -2376,25 +2376,6 @@ | ||
| 2376 | 2376 | |
| 2377 | 2377 | |
| 2378 | 2378 | /* |
| 2379 | - * Special Monster Flags (all temporary) | |
| 2380 | - */ | |
| 2381 | -#define MFLAG_VIEW 0x01 /* Monster is in line of sight */ | |
| 2382 | -#define MFLAG_TEMP 0x02 /* Monster is marked for project_all_los() */ | |
| 2383 | -#define MFLAG_XXX2 0x04 /* (unused) */ | |
| 2384 | -#define MFLAG_XXX3 0x08 /* (unused) */ | |
| 2385 | -#define MFLAG_BORN 0x10 /* Monster is still being born */ | |
| 2386 | -#define MFLAG_NICE 0x20 /* Monster is still being nice */ | |
| 2387 | - | |
| 2388 | -#define MFLAG2_KAGE 0x01 /* Monster is kage */ | |
| 2389 | -#define MFLAG2_NOPET 0x02 /* Cannot make monster pet */ | |
| 2390 | -#define MFLAG2_NOGENO 0x04 /* Cannot genocide */ | |
| 2391 | -#define MFLAG2_CHAMELEON 0x08 /* Monster is chameleon */ | |
| 2392 | -#define MFLAG2_NOFLOW 0x10 /* Monster is in no_flow_by_smell mode */ | |
| 2393 | -#define MFLAG2_SHOW 0x20 /* Monster is recently memorized */ | |
| 2394 | -#define MFLAG2_MARK 0x40 /* Monster is currently memorized */ | |
| 2395 | - | |
| 2396 | - | |
| 2397 | -/* | |
| 2398 | 2379 | * Object flags |
| 2399 | 2380 | * |
| 2400 | 2381 | * Old variables for object flags such as flags1, flags2, and flags3 |
| @@ -774,7 +774,6 @@ bool project_all_los(EFFECT_ID typ, HIT_POINT dam) | ||
| 774 | 774 | BIT_FLAGS flg = PROJECT_JUMP | PROJECT_KILL | PROJECT_HIDE; |
| 775 | 775 | bool obvious = FALSE; |
| 776 | 776 | |
| 777 | - | |
| 778 | 777 | /* Mark all (nearby) monsters */ |
| 779 | 778 | for (i = 1; i < m_max; i++) |
| 780 | 779 | { |
| @@ -607,7 +607,21 @@ struct monster_type | ||
| 607 | 607 | POSITION cdis; /* Current dis from player */ |
| 608 | 608 | |
| 609 | 609 | BIT_FLAGS8 mflag; /* Extra monster flags */ |
| 610 | + #define MFLAG_VIEW 0x01 /* Monster is in line of sight */ | |
| 611 | + #define MFLAG_TEMP 0x02 /* Monster is marked for project_all_los() */ | |
| 612 | + #define MFLAG_XXX2 0x04 /* (unused) */ | |
| 613 | + #define MFLAG_XXX3 0x08 /* (unused) */ | |
| 614 | + #define MFLAG_BORN 0x10 /* Monster is still being born */ | |
| 615 | + #define MFLAG_NICE 0x20 /* Monster is still being nice */ | |
| 616 | + | |
| 610 | 617 | BIT_FLAGS8 mflag2; /* Extra monster flags */ |
| 618 | + #define MFLAG2_KAGE 0x01 /* Monster is kage */ | |
| 619 | + #define MFLAG2_NOPET 0x02 /* Cannot make monster pet */ | |
| 620 | + #define MFLAG2_NOGENO 0x04 /* Cannot genocide */ | |
| 621 | + #define MFLAG2_CHAMELEON 0x08 /* Monster is chameleon */ | |
| 622 | + #define MFLAG2_NOFLOW 0x10 /* Monster is in no_flow_by_smell mode */ | |
| 623 | + #define MFLAG2_SHOW 0x20 /* Monster is recently memorized */ | |
| 624 | + #define MFLAG2_MARK 0x40 /* Monster is currently memorized */ | |
| 611 | 625 | |
| 612 | 626 | bool ml; /* Monster is "visible" */ |
| 613 | 627 |
Fork