diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2019-06-30 15:21:58 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2019-06-30 15:21:58 +0200 |
| commit | 7c6b291860fd415f79067fc7058f11ffa58fdf10 (patch) | |
| tree | 15ccabed4c8c5d7c5c2f7a636035876cbd183e4d /src/common.h | |
| parent | Reactivated Store(Restore)StuffIn(From)Mem, fixed bugs (diff) | |
| parent | Merge pull request #78 from ShFil119/cleanup (diff) | |
| download | re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.gz re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.bz2 re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.lz re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.xz re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.zst re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.zip | |
Diffstat (limited to 'src/common.h')
| -rw-r--r-- | src/common.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/common.h b/src/common.h index 0345b65c..efbc1f8c 100644 --- a/src/common.h +++ b/src/common.h @@ -14,7 +14,7 @@ #include <new> #ifdef WITHD3D -#include <Windows.h> +#include <windows.h> #include <d3d8types.h> #endif @@ -43,7 +43,7 @@ typedef int64_t int64; // hardcode ucs-2 typedef uint16_t wchar; -#define nil NULL +#define nil nullptr #include "config.h" @@ -53,7 +53,7 @@ typedef uint16_t wchar; extern void **rwengine; #define RwEngineInstance (*rwengine) -#include "skel\skeleton.h" +#include "skeleton.h" #include "Draw.h" /* @@ -164,3 +164,6 @@ void re3_assert(const char *expr, const char *filename, unsigned int lineno, con #define PERCENT(x, p) ((float(x) * (float(p) / 100.0f))) #define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0])) #define BIT(num) (1<<(num)) + +#define max(a, b) (((a) > (b)) ? (a) : (b)) +#define min(a, b) (((a) < (b)) ? (a) : (b)) |