archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-04 01:30:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge with master

Browse Source
This commit is contained in:
Nikolay Korolev
2020-03-22 17:26:18 +03:00
parent 34b1881528 5e37c3e805
commit 360d9cf889
5 changed files with 97 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/RwMatFX.cpp
View File

@ -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);

3
src/core/common.h
View File

@ -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*, ...);

1
src/core/re3.cpp
View File

@ -19,6 +19,7 @@
#include "Ped.h"
#include "debugmenu_public.h"
#include "Particle.h"
#include "Console.h"
#include <vector>
#include <list>