mirror of
https://github.com/zeldaret/oot.git
synced 2025-07-10 01:44:36 +00:00
Move button macros to include/controller.h (#2138)
* Move button macros to include/controller.h * Fix z_mag button ordering
This commit is contained in:
parent
bb6177e936
commit
3faa1c6acc
11 changed files with 43 additions and 38 deletions
|
@ -105,14 +105,6 @@
|
|||
? gSaveContext.save.info.equips.buttonItems[(button) + 1] \
|
||||
: ITEM_NONE)
|
||||
|
||||
#if PLATFORM_N64
|
||||
#define CHECK_BTN_ALL(state, combo) (((state) & (combo)) == (combo))
|
||||
#else
|
||||
#define CHECK_BTN_ALL(state, combo) (~((state) | ~(combo)) == 0)
|
||||
#endif
|
||||
|
||||
#define CHECK_BTN_ANY(state, combo) (((state) & (combo)) != 0)
|
||||
|
||||
#define CHECK_FLAG_ALL(flags, mask) (((flags) & (mask)) == (mask))
|
||||
|
||||
// IDO doesn't support variadic macros, but it merely throws a warning for the
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue