Skip to content
This repository has been archived by the owner. It is now read-only.

implemented CMemoryHeap #838

Merged
merged 2 commits into from Nov 26, 2020
Merged

implemented CMemoryHeap #838

merged 2 commits into from Nov 26, 2020

Conversation

@aap
Copy link
Member

@aap aap commented Nov 25, 2020

No description provided.

@aap aap force-pushed the aap:master branch 2 times, most recently from 747aa85 to 51220ac Nov 25, 2020
src/rw/MemoryHeap.cpp Outdated Show resolved Hide resolved
void *mem = Malloc(size);
if (removeCollision) {
CTimer::Stop();
// different on PS2

This comment has been minimized.

@Fire-Head

Fire-Head Nov 25, 2020
Member

#ifdef GTA_PS2 CFileLoader::LoadCollisionFile((CCollision::ms_pColFiles[CCollision::ms_collisionInMemory]); #else
maybe then ?

This comment has been minimized.

@aap

aap Nov 25, 2020
Author Member

it's not really ps2 specific though, just older code. and we haven't found a very good way to kept track of older code yet. besides, it would need changes in CCollision as well to be consistent. so i think i'll leave it for now until we have decided what to do about these cases.

@aap aap force-pushed the aap:master branch from 51220ac to 106f021 Nov 25, 2020
@aap aap force-pushed the aap:master branch from 106f021 to 88baa9c Nov 25, 2020
@aap aap changed the title implemented CMemoryHeap, not used or tested yet implemented CMemoryHeap Nov 25, 2020
@aap aap merged commit f55859a into GTAmodding:master Nov 26, 2020
14 checks passed
14 checks passed
@github-actions
build (win-amd64-librw_d3d9-oal, Debug)
Details
@github-actions
build (win-x86-librw_d3d9-mss, Debug)
Details
@github-actions
build (win-amd64-librw_d3d9-oal, Release)
Details
@github-actions
build (win-x86-librw_d3d9-mss, Release)
Details
@github-actions
build (win-amd64-librw_gl3_glfw-oal, Debug)
Details
@github-actions
build (win-x86-librw_gl3_glfw-mss, Debug)
Details
@github-actions
build (win-amd64-librw_gl3_glfw-oal, Release)
Details
@github-actions
build (win-x86-librw_gl3_glfw-mss, Release)
Details
@github-actions
build (win-x86-librw_d3d9-oal, Debug)
Details
@github-actions
build (win-x86-librw_d3d9-oal, Release)
Details
@github-actions
build (win-x86-librw_gl3_glfw-oal, Debug)
Details
@github-actions
build (win-x86-librw_gl3_glfw-oal, Release)
Details
@appveyor
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants