OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into floatcvt

Browse source 
# Conflicts:
#	src/g_hexen/a_heresiarch.cpp
#	src/g_shared/a_quake.cpp
This commit is contained in:
Christoph Oelckers 2016-03-20 00:56:09 +01:00
commit a43dccaa86
9 changed files with 210 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/g_shared/a_quake.cpp
View file

@ -143,7 +143,7 @@ void DEarthquake::Tick ()
DAngle an = victim->Angles.Yaw + pr_quake();
if (m_IntensityX == m_IntensityY)
{ // Thrust in a circle
P_ThrustMobj (victim, an, m_IntensityX << (FRACBITS-1));
P_ThrustMobj (victim, an, m_IntensityX/2);
}
else
{ // Thrust in an ellipse