From dd0cd75a97f64a511dcb5d08e917957e0cff3bd3 Mon Sep 17 00:00:00 2001
From: XProger <xproger@list.ru>
Date: Mon, 3 Jul 2017 00:55:51 +0300
Subject: [PATCH] #60 fix

---
 src/collision.h | 3 ++-
 src/input.h     | 6 +++---
 src/lara.h      | 4 ++--
 src/mesh.h      | 2 +-
 src/sound.h     | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/collision.h b/src/collision.h
index e9bb4aa..378cf78 100644
--- a/src/collision.h
+++ b/src/collision.h
@@ -82,7 +82,8 @@ struct Collision {
         inf.floor     = info.floor;
         inf.ceiling   = info.ceiling;
 
-        if ((info.ceiling == info.floor) ||  (info.floor - info.ceiling < height) || (py - info.floor > maxAscent) || (info.floor - py > maxDescent) || (info.ceiling > py)) {
+        if ((info.ceiling == info.floor) ||  (info.floor - info.ceiling < height) || (py - info.floor > maxAscent) || (info.floor - py > maxDescent) || (info.ceiling > py) ||
+            (maxAscent == maxDescent && (maxAscent <= 256 + 128) && (abs(info.slantX) > 2 || abs(info.slantZ) > 2))) {
             this->side = side;
             return true;
         }
diff --git a/src/input.h b/src/input.h
index a25e03e..7b7de9f 100644
--- a/src/input.h
+++ b/src/input.h
@@ -246,9 +246,9 @@ namespace Input {
         vec2  center = vec2(Core::width - offset * 0.7f, Core::height - offset * 0.7f);
 
         btnPos[bWeapon] = center;
-        btnPos[bJump]   = center + vec2(cos(-PI * 0.5f), sin(-PI * 0.5f)) * radius;
-        btnPos[bAction] = center + vec2(cos(-PI * 3.0f / 4.0f), sin(-PI * 3.0f / 4.0f)) * radius;
-        btnPos[bWalk]   = center + vec2(cos(-PI), sin(-PI)) * radius;
+        btnPos[bJump]   = center + vec2(cosf(-PI * 0.5f), sinf(-PI * 0.5f)) * radius;
+        btnPos[bAction] = center + vec2(cosf(-PI * 3.0f / 4.0f), sinf(-PI * 3.0f / 4.0f)) * radius;
+        btnPos[bWalk]   = center + vec2(cosf(-PI), sinf(-PI)) * radius;
         btnRadius       = Core::height * (25.0f / 1080.0f);
 
     // touch update
diff --git a/src/lara.h b/src/lara.h
index 9a140a4..2a3ff2e 100644
--- a/src/lara.h
+++ b/src/lara.h
@@ -422,7 +422,7 @@ struct Lara : Character {
 
         if (level->extra.braid > -1)
             braid = new Braid(this, vec3(-4.0f, 24.0f, -48.0f));
-//reset(15, vec3(70067, -256, 29104), -0.68f);     // level 2 (pool)
+
     #ifdef _DEBUG
         //reset(14, vec3(40448, 3584, 60928), PI * 0.5f, true);  // gym (pool)
 
@@ -432,7 +432,7 @@ struct Lara : Character {
         //reset(43, vec3(31400, -2560, 25200), PI);        // level 2 (reach)
         //reset(16, vec3(60907, 0, 39642), PI * 3 / 2);    // level 2 (hang & climb)
         //reset(19, vec3(60843, 1024, 30557), PI);         // level 2 (block)
-        reset(1,  vec3(62630, -1280, 19633), 0);         // level 2 (dark medikit)
+        //reset(1,  vec3(62630, -1280, 19633), 0);         // level 2 (dark medikit)
         //reset(7,  vec3(64108, -512, 16514), -PI * 0.5f); // level 2 (bat trigger)
         //reset(15, vec3(70082, -512, 26935), PI * 0.5f);  // level 2 (bear)
         //reset(63, vec3(31390, -2048, 33472), 0.0f);      // level 2 (trap floor)
diff --git a/src/mesh.h b/src/mesh.h
index c311917..e607baf 100644
--- a/src/mesh.h
+++ b/src/mesh.h
@@ -514,7 +514,7 @@ struct MeshBuilder {
 
     // circle
         vec2 pos(32767.0f, 0.0f);
-        vec2 cs(cos(PI2 / CIRCLE_SEGS), sin(PI2 / CIRCLE_SEGS));
+        vec2 cs(cosf(PI2 / CIRCLE_SEGS), sinf(PI2 / CIRCLE_SEGS));
 
         for (int i = 0; i < CIRCLE_SEGS; i++) {
             Vertex &v = vertices[vCount + i];
diff --git a/src/sound.h b/src/sound.h
index 6b6bc93..05e6eab 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -88,8 +88,8 @@ namespace Sound {
                 float k = -10.0f / (44100.0f * rt60);
 
                 for (int i = 0; i < MAX_FDN; i++) {
-                    absCoeff[i][0] = pow(10.0f, FDN[i] * k);
-                    absCoeff[i][1] = 1.0f - (2.0f / (1.0f + pow(absCoeff[i][0], 1.0f - 1.0f / 0.15f)));
+                    absCoeff[i][0] = powf(10.0f, FDN[i] * k);
+                    absCoeff[i][1] = 1.0f - (2.0f / (1.0f + powf(absCoeff[i][0], 1.0f - 1.0f / 0.15f)));
                 }
             };