Skip to content

Commit

Permalink
Revert "Revert "Merge pull request #6 from z33ky/sniper-zoom-orientat…
Browse files Browse the repository at this point in the history
…ion""

This reverts commit 224b292.
  • Loading branch information
Bitl committed Dec 14, 2018
1 parent 122943a commit 8be2287
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions blackshades/Source/GameTick.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,7 @@ void Game::Tick(){



if(zoom||person[0].aimamount<=0||person[0].whichgun==nogun||visions||person[0].whichgun==grenade||person[0].whichgun==knife){
if(oldzoom||zoom||person[0].aimamount<=0||person[0].whichgun==nogun||visions||person[0].whichgun==grenade||person[0].whichgun==knife){

camera.visrotation=camera.rotation;

Expand Down Expand Up @@ -1699,21 +1699,26 @@ void Game::Tick(){

mousesensitivity=.05*usermousesensitivity;

if(person[i].targetanimation!=crouchanim||person[i].currentanimation!=crouchanim||person[i].aiming<1){
if(person[i].targetanimation!=crouchanim||person[i].currentanimation!=crouchanim||person[i].aiming<1||visions==1){

zoom=0;
camera.rotation2+=14;
camera.rotation+=9;

}

if(visions==1)zoom=0;

}

if(person[i].currentanimation==crouchanim&&person[i].targetanimation==crouchanim&&person[i].aiming>=1&&person[i].whichgun==sniperrifle){

zoom=1;

if(zoom&&!oldzoom)camera.rotation2-=6;
if(!oldzoom){

camera.rotation2-=14;
camera.rotation-=9;

}

}

Expand Down

0 comments on commit 8be2287

Please sign in to comment.