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_pspr.cpp
View file

@ -582,8 +582,9 @@ void P_BobWeapon (player_t *player, float *x, float *y, double ticfrac)
if (curbob != 0)
{
float bobx = float(player->bob * Rangex);
float boby = float(player->bob * Rangey);
//[SP] Added in decorate player.viewbob checks
float bobx = float(player->bob * Rangex * (float)player->mo->ViewBob);
float boby = float(player->bob * Rangey * (float)player->mo->ViewBob);
switch (bobstyle)
{
case AWeapon::BobNormal: