diff options
Diffstat (limited to 'src/GameTick.cpp')
| -rw-r--r-- | src/GameTick.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/GameTick.cpp b/src/GameTick.cpp index 7fa90fa..e71d8dd 100644 --- a/src/GameTick.cpp +++ b/src/GameTick.cpp @@ -29,7 +29,7 @@ extern float multiplier; extern int thirdperson; -extern int visions; +extern bool visions; extern Sprites sprites; extern unsigned int gSourceID[37]; extern Camera camera; @@ -1309,7 +1309,8 @@ void Game::Tick() && sqrlen(person[i].playercoords - person[person[i].killtarget].playercoords) > 30000) person[i].killtargetvisible = 0; - if(person[i].killtarget==0&&visions==1)person[i].killtargetvisible=0; + if (person[i].killtarget == 0 && visions) + person[i].killtargetvisible = 0; if(person[i].killtargetvisible){ beginx=person[i].whichblockx-2; @@ -1472,8 +1473,11 @@ void Game::Tick() person[i].whichblockx=((person[i].playercoords.x+block_spacing/2)/block_spacing); person[i].whichblocky=((person[i].playercoords.z+block_spacing/2)/block_spacing); - if(!person[i].onground)person[i].velocity.y+=multiplier*gravity; - if(!person[i].onground&&(i!=0||visions!=1))person[i].playercoords+=person[i].velocity*multiplier; + if (!person[i].onground) { + person[i].velocity.y += multiplier * gravity; + if (i != 0 || !visions) + person[i].playercoords += person[i].velocity * multiplier; + } //Death by bleeding/shock if(person[i].health<=0){ @@ -1558,7 +1562,7 @@ void Game::Tick() } attackCloseRange(this, flatfacing); - if (person[0].currentanimation == diveanim && visions == 0) + if (person[0].currentanimation == diveanim && !visions) tackle(this, flatfacing); // Empty magazine |