OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/rheit/zdoom into zscript

Browse source 
# Conflicts:
#	wadsrc/static/actors/shared/player.txt
This commit is contained in:
Christoph Oelckers 2016-10-21 19:31:08 +02:00
commit 3b0b0baf05
14 changed files with 82 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/p_user.cpp
View file

@ -651,7 +651,8 @@ void APlayerPawn::Serialize(FSerializer &arc)
("fallingscreammaxn", FallingScreamMaxSpeed, def->FallingScreamMaxSpeed)
("userange", UseRange, def->UseRange)
("aircapacity", AirCapacity, def->AirCapacity)
("viewheight", ViewHeight, def->ViewHeight);
("viewheight", ViewHeight, def->ViewHeight)
("viewbob", ViewBob, def->ViewBob);
}
//===========================================================================
@ -1891,7 +1892,7 @@ void P_CalcHeight (player_t *player)
{
bob = 0;
}
player->viewz = player->mo->Z() + player->viewheight + bob;
player->viewz = player->mo->Z() + player->viewheight + (bob * player->mo->ViewBob); // [SP] Allow DECORATE changes to view bobbing speed.
if (player->mo->Floorclip && player->playerstate != PST_DEAD
&& player->mo->Z() <= player->mo->floorz)
{