OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into json

Browse source
This commit is contained in:
Christoph Oelckers 2016-09-19 03:54:36 +02:00
commit 65c6388d44
48 changed files with 650 additions and 433 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/info.cpp
View file

@ -344,7 +344,7 @@ size_t PClassActor::PropagateMark()
// Mark damage function
if (Defaults != NULL)
{
GC::Mark(((AActor *)Defaults)->Damage);
GC::Mark(((AActor *)Defaults)->DamageFunc);
}
// marked += ActorInfo->NumOwnedStates * sizeof(FState);