mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-31 07:58:22 +01:00
Update input.dm
This commit is contained in:
@@ -10,11 +10,7 @@
|
||||
// Combine the held WASD and arrow keys together (OR) into byond N/S/E/W dir
|
||||
#define MOVEMENT_KEYS_TO_DIR(MK) ((((MK)>>4)|(MK))&(ALL_CARDINALS))
|
||||
|
||||
<<<<<<< HEAD
|
||||
// Bitflags for pressed modifier keys.
|
||||
=======
|
||||
// Bitflags for pressed modifier keys.
|
||||
>>>>>>> c463104999a... Ports Diagonal Movement (#8199)
|
||||
// Values chosen specifically to not conflict with dir bitfield, in case we want to smoosh them together.
|
||||
#define CTRL_KEY (1<<8)
|
||||
#define SHIFT_KEY (1<<9)
|
||||
|
||||
Reference in New Issue
Block a user