From 2b4f2692c6fd8799948e85f2148c4bef2db52e90 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 20 Dec 2016 15:26:35 +0100 Subject: [PATCH] remove recurring checks Signed-off-by: Igor Gnatenko --- Source/GameTick.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp index 7d66b43..514ab54 100644 --- a/Source/GameTick.cpp +++ b/Source/GameTick.cpp @@ -1958,7 +1958,7 @@ void doAerialAcrobatics() whichhit = Object::objects[i]->model.LineCheckPossible(&lowpoint, &lowpointtarget, &colpoint, &Object::objects[i]->position, &Object::objects[i]->yaw); if (Object::objects[i]->friction > .5) if (whichhit != -1) { - if (whichhit != -1 && Person::players[k]->animTarget != jumpupanim && Person::players[k]->animTarget != jumpdownanim) + if (Person::players[k]->animTarget != jumpupanim && Person::players[k]->animTarget != jumpdownanim) Person::players[k]->collided = 1; if (Object::checkcollide(lowpoint7, lowpointtarget7) == -1) if (Object::checkcollide(lowpoint6, lowpointtarget6) == -1) @@ -4437,7 +4437,7 @@ void Game::TickOnceAfter() } if (changedelay <= 0 && !loading && !editorenabled && gameon && !Tutorial::active && changedelay != -999 && !won) { - if (Person::players[0]->dead && changedelay <= 0) { + if (Person::players[0]->dead) { changedelay = 1; targetlevel = whichlevel; } -- 2.39.2