diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-03-22 15:26:18 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-03-22 15:26:18 +0100 |
| commit | 360d9cf8895123d978ac4c4dae56f6ba76f379b6 (patch) | |
| tree | 716e881db18506e2fee9a53f5674f28edce72138 /src/core | |
| parent | CGame::Initialise (diff) | |
| parent | Console (diff) | |
| download | re3-360d9cf8895123d978ac4c4dae56f6ba76f379b6.tar re3-360d9cf8895123d978ac4c4dae56f6ba76f379b6.tar.gz re3-360d9cf8895123d978ac4c4dae56f6ba76f379b6.tar.bz2 re3-360d9cf8895123d978ac4c4dae56f6ba76f379b6.tar.lz re3-360d9cf8895123d978ac4c4dae56f6ba76f379b6.tar.xz re3-360d9cf8895123d978ac4c4dae56f6ba76f379b6.tar.zst re3-360d9cf8895123d978ac4c4dae56f6ba76f379b6.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/RwMatFX.cpp | 1 | ||||
| -rw-r--r-- | src/core/common.h | 3 | ||||
| -rw-r--r-- | src/core/re3.cpp | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/src/core/RwMatFX.cpp b/src/core/RwMatFX.cpp index 5fd00c54..ca9a633b 100644 --- a/src/core/RwMatFX.cpp +++ b/src/core/RwMatFX.cpp @@ -143,6 +143,7 @@ _rpMatFXD3D8AtomicMatFXEnvRender_ps2(RxD3D8InstanceData *inst, int flags, int se RwD3D8SetTexture(texture, 0); else RwD3D8SetTexture(nil, 0); + RwD3D8SetPixelShader(0); RwD3D8SetVertexShader(inst->vertexShader); RwD3D8SetStreamSource(0, inst->vertexBuffer, inst->stride); RwD3D8SetIndices(inst->indexBuffer, inst->baseIndex); diff --git a/src/core/common.h b/src/core/common.h index 9a5cdb38..562a69b4 100644 --- a/src/core/common.h +++ b/src/core/common.h @@ -370,3 +370,6 @@ inline T *WriteSaveBuf(uint8 *&buf, const T &value) assert(ReadSaveBuf<char>(buf) == c);\ assert(ReadSaveBuf<char>(buf) == d);\ assert(ReadSaveBuf<uint32>(buf) == size); + + +void cprintf(char*, ...);
\ No newline at end of file diff --git a/src/core/re3.cpp b/src/core/re3.cpp index ed32632f..6f0a4682 100644 --- a/src/core/re3.cpp +++ b/src/core/re3.cpp @@ -19,6 +19,7 @@ #include "Ped.h" #include "debugmenu_public.h" #include "Particle.h" +#include "Console.h" #include <vector> #include <list> |