OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into scripting

Browse source 
Conflicts:
	src/actor.h
	src/p_user.cpp
	src/thingdef/thingdef_expression.cpp
This commit is contained in:
Christoph Oelckers 2016-01-20 15:16:06 +01:00
commit c78344c19d
11 changed files with 303 additions and 324 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/p_mobj.cpp
View file

@ -230,9 +230,9 @@ void AActor::Serialize (FArchive &arc)
sprite = arc.ReadSprite ();
}
arc << x
<< y
<< z
arc << __pos.x
<< __pos.y
<< __pos.z
<< angle
<< frame
<< scaleX