Merge remote-tracking branch 'remotes/origin/master' into asmjit
This commit is contained in:
commit
acbdfddb26
2 changed files with 11 additions and 15 deletions
|
|
@ -1,4 +1,4 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// Copyright 1993-1996 id Software
|
||||
// Copyright 1994-1996 Raven Software
|
||||
|
|
@ -533,7 +533,8 @@ void AActor::Serialize(FSerializer &arc)
|
|||
A("renderhidden", RenderHidden)
|
||||
A("renderrequired", RenderRequired)
|
||||
A("friendlyseeblocks", friendlyseeblocks)
|
||||
A("spawntime", SpawnTime);
|
||||
A("spawntime", SpawnTime)
|
||||
A("friction", Friction);
|
||||
}
|
||||
|
||||
#undef A
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue