diff options
| author | aap <aap@papnet.eu> | 2021-01-13 12:31:23 +0100 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2021-01-13 12:31:33 +0100 |
| commit | 1b55a9956f6dbb2e89e739c133158aa6e08fc9e8 (patch) | |
| tree | 9deee06a7f79aba79aa621217c60abd89e767761 /src | |
| parent | Merge pull request #957 from erorcun/miami (diff) | |
| download | re3-1b55a9956f6dbb2e89e739c133158aa6e08fc9e8.tar re3-1b55a9956f6dbb2e89e739c133158aa6e08fc9e8.tar.gz re3-1b55a9956f6dbb2e89e739c133158aa6e08fc9e8.tar.bz2 re3-1b55a9956f6dbb2e89e739c133158aa6e08fc9e8.tar.lz re3-1b55a9956f6dbb2e89e739c133158aa6e08fc9e8.tar.xz re3-1b55a9956f6dbb2e89e739c133158aa6e08fc9e8.tar.zst re3-1b55a9956f6dbb2e89e739c133158aa6e08fc9e8.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/main.cpp | 4 | ||||
| -rw-r--r-- | src/render/MBlur.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/core/main.cpp b/src/core/main.cpp index d0663c30..a84bd495 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -1421,11 +1421,13 @@ Idle(void *arg) CSprite2d::InitPerFrame(); CFont::InitPerFrame(); + PUSH_MEMID(MEMID_GAME_PROCESS); CPointLights::InitPerFrame(); tbStartTimer(0, "CGame::Process"); CGame::Process(); tbEndTimer("CGame::Process"); + POP_MEMID(); tbStartTimer(0, "DMAudio.Service"); DMAudio.Service(); @@ -1447,6 +1449,8 @@ Idle(void *arg) if(arg == nil) return; + PUSH_MEMID(MEMID_RENDER); + if(!FrontEndMenuManager.m_bMenuActive && TheCamera.GetScreenFadeStatus() != FADE_2) { // This is from SA, but it's nice for windowed mode diff --git a/src/render/MBlur.cpp b/src/render/MBlur.cpp index 44d4f1d4..205f9d92 100644 --- a/src/render/MBlur.cpp +++ b/src/render/MBlur.cpp @@ -442,7 +442,7 @@ CMBlur::OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type, RwIm2DVertexSetIntRGBA(&Vertex2[3], r, g, b, 80); RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA); RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA); - // TODO(MIAMI): pBufVertCount = 0; + pBufVertCount = 0; }else{ RwIm2DVertexSetIntRGBA(&Vertex2[0], r*2, g*2, b*2, 30); RwIm2DVertexSetIntRGBA(&Vertex2[1], r*2, g*2, b*2, 30); |