diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-07-18 12:30:51 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-07-18 12:30:51 +0200 |
| commit | 87eb96453a405bfa0fbfffb57c9d6cfc74acfb70 (patch) | |
| tree | 3e91115fa0a99c22eb0293b5c4fec812eeaa11fc /rwsdk/include/d3d8/rpdbgerr.h | |
| parent | Actual fix now xD (diff) | |
| download | re3-87eb96453a405bfa0fbfffb57c9d6cfc74acfb70.tar re3-87eb96453a405bfa0fbfffb57c9d6cfc74acfb70.tar.gz re3-87eb96453a405bfa0fbfffb57c9d6cfc74acfb70.tar.bz2 re3-87eb96453a405bfa0fbfffb57c9d6cfc74acfb70.tar.lz re3-87eb96453a405bfa0fbfffb57c9d6cfc74acfb70.tar.xz re3-87eb96453a405bfa0fbfffb57c9d6cfc74acfb70.tar.zst re3-87eb96453a405bfa0fbfffb57c9d6cfc74acfb70.zip | |
Diffstat (limited to 'rwsdk/include/d3d8/rpdbgerr.h')
| -rw-r--r-- | rwsdk/include/d3d8/rpdbgerr.h | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/rwsdk/include/d3d8/rpdbgerr.h b/rwsdk/include/d3d8/rpdbgerr.h index 6918469a..e0500057 100644 --- a/rwsdk/include/d3d8/rpdbgerr.h +++ b/rwsdk/include/d3d8/rpdbgerr.h @@ -16,8 +16,6 @@ /* Pick up _ASSERTE macro */ #ifdef _XBOX #include <xtl.h> -#else /* _XBOX */ -#include <windows.h> #endif /* _XBOX */ #if (defined(RWMEMDEBUG) && !defined(_CRTDBG_MAP_ALLOC)) #define _CRTDBG_MAP_ALLOC @@ -235,6 +233,22 @@ do \ } \ while (0) +#define RWASSERTM(condition, messageArgs) \ +do \ +{ \ + if (!(condition)) \ + { \ + RwDebugSendMessage(rwDEBUGASSERT, \ + __dbFunctionName, \ + RWSTRING(#condition)); \ + RwDebugSendMessage(rwDEBUGMESSAGE, \ + __dbFunctionName, \ + _rwdbsprintf messageArgs); \ + } \ + RWASSERTE(condition); \ +} \ +while (0) + #else /* RWDEBUG */ #define RWRETURN(value) return(value) @@ -253,6 +267,7 @@ while (0) #define RWFUNCTION(name) #define RWAPIFUNCTION(name) #define RWASSERT(condition) +#define RWASSERTM(condition, messageArgs) #define RWMESSAGE(args) #endif |