diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-26 23:55:22 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-26 23:55:22 +0200 |
| commit | a38a867cc5fe1677866b7a6b6c01c4dc5dc3387b (patch) | |
| tree | 35f1795ea2a38d996e43dd5119e28e26a34f06d3 /src/core/common.h | |
| parent | pools compatibility (diff) | |
| parent | Merge pull request #489 from Nick007J/master (diff) | |
| download | re3-a38a867cc5fe1677866b7a6b6c01c4dc5dc3387b.tar re3-a38a867cc5fe1677866b7a6b6c01c4dc5dc3387b.tar.gz re3-a38a867cc5fe1677866b7a6b6c01c4dc5dc3387b.tar.bz2 re3-a38a867cc5fe1677866b7a6b6c01c4dc5dc3387b.tar.lz re3-a38a867cc5fe1677866b7a6b6c01c4dc5dc3387b.tar.xz re3-a38a867cc5fe1677866b7a6b6c01c4dc5dc3387b.tar.zst re3-a38a867cc5fe1677866b7a6b6c01c4dc5dc3387b.zip | |
Diffstat (limited to 'src/core/common.h')
| -rw-r--r-- | src/core/common.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/core/common.h b/src/core/common.h index 8b057efa..18f4715c 100644 --- a/src/core/common.h +++ b/src/core/common.h @@ -11,11 +11,11 @@ #include <string.h> #include <math.h> -#ifdef WITHWINDOWS +#if defined _WIN32 && defined WITHWINDOWS #include <windows.h> #endif -#ifdef WITHD3D +#if defined _WIN32 && defined WITHD3D #include <windows.h> #include <d3d8types.h> #endif @@ -31,6 +31,7 @@ #define HIERNODEID(hier, i) ((hier)->nodeInfo[i].id) #define HANIMFRAMES(anim) ((anim)->keyframes) #else +#define RWHALFPIXEL // always d3d #define STREAMPOS(str) ((str)->Type.memory.position) #define STREAMFILE(str) ((str)->Type.file.fpFile) #define HIERNODEINFO(hier) ((hier)->pNodeInfo) @@ -38,6 +39,12 @@ #define HANIMFRAMES(anim) ((anim)->pFrames) #endif +#ifdef RWHALFPIXEL +#define HALFPX (0.5f) +#else +#define HALFPX (0.0f) +#endif + #define rwVENDORID_ROCKSTAR 0x0253F2 // Get rid of bullshit windows definitions, we're not running on an 8086 @@ -88,13 +95,6 @@ inline uint32 ldb(uint32 p, uint32 s, uint32 w) return w>>p & (1<<s)-1; } - -#ifndef RWLIBS -// little hack -extern void **rwengine; -#define RwEngineInstance (*rwengine) -#endif - #include "skeleton.h" #include "Draw.h" |