diff options
| author | Haru <haru@dotalux.com> | 2018-06-02 16:19:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-02 16:19:59 +0200 |
| commit | b8cdb8e191f17cb0c8798e0379be9d68c72d6368 (patch) | |
| tree | d177ea2eccf2207423c8deae85021ef7e5949512 /src/map/pc.h | |
| parent | e6596534654e7ca395c34db5a8d589ebbcaa0a7d (diff) | |
| parent | 90be2a7937e7552a72d1e7eb632e6bc2d01443ef (diff) | |
| download | hercules-b8cdb8e191f17cb0c8798e0379be9d68c72d6368.tar.gz hercules-b8cdb8e191f17cb0c8798e0379be9d68c72d6368.tar.bz2 hercules-b8cdb8e191f17cb0c8798e0379be9d68c72d6368.tar.xz hercules-b8cdb8e191f17cb0c8798e0379be9d68c72d6368.zip | |
Merge pull request #842 from AnnieRuru/request_6
Add new *pcblock script command
Diffstat (limited to 'src/map/pc.h')
| -rw-r--r-- | src/map/pc.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/map/pc.h b/src/map/pc.h index cb132582b..695add32f 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -201,10 +201,8 @@ struct map_session_data { unsigned int noask :1; // [LuzZza] unsigned int trading :1; //[Skotlex] is 1 only after a trade has started. unsigned int deal_locked :2; //1: Clicked on OK. 2: Clicked on TRADE - unsigned int monster_ignore :1; // for monsters to ignore a character [Valaris] [zzo] unsigned int size :2; // for tiny/large types unsigned int night :1; //Holds whether or not the player currently has the SI_NIGHT effect on. [Skotlex] - unsigned int blockedmove :1; unsigned int using_fake_npc :1; unsigned int rewarp :1; //Signals that a player should warp as soon as he is done loading a map. [Skotlex] unsigned int killer : 1; @@ -621,6 +619,16 @@ END_ZEROED_BLOCK; // HatEffect VECTOR_DECL(int) hatEffectId; + struct { + unsigned move : 1; + unsigned attack : 1; + unsigned skill : 1; + unsigned useitem : 1; + unsigned chat : 1; + unsigned immune : 1; + unsigned sitstand : 1; + unsigned commands : 1; + } block_action; }; #define EQP_WEAPON EQP_HAND_R |