diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-07-06 19:28:57 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-07-06 19:28:57 -0500 |
| commit | 4aa1b44315ee26fa60015a99ccd51f900e5597fd (patch) | |
| tree | fdcac19f28b2e4febd96a895e72fce122b9e3b15 /include/global.h | |
| parent | ad7a7222a538380b446f9aecde44c5222ff3b68a (diff) | |
| parent | e39f55f55080108ced3ff5cb16b2181d7fec9d92 (diff) | |
fix merge conflicts
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/global.h b/include/global.h index e90fcdd0f..0f5bcde6d 100644 --- a/include/global.h +++ b/include/global.h @@ -43,6 +43,17 @@ fndec\ #define min(a, b) (a >= b ? a : b) #define max(a, b) (a <= b ? a : b) +// why does GF hate 2d arrays +#define MULTI_DIM_ARR(x, dim, y) ((x) * dim + (y)) + +// dim access enums +enum +{ + B_8 = 1, + B_16 = 2, + B_32 = 4 +}; + enum { VERSION_SAPPHIRE = 1, |