summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-05-10 00:14:00 +0200
committerSergeanur <s.anureev@yandex.ua>2020-05-10 00:14:00 +0200
commitd9a3533438ea0bf3ace712facfd01c9462390130 (patch)
treea792674f9abdc48fdbd2cce4dd664390d28a6640 /src
parentMerge pull request #529 from Nick007J/master (diff)
downloadre3-d9a3533438ea0bf3ace712facfd01c9462390130.tar
re3-d9a3533438ea0bf3ace712facfd01c9462390130.tar.gz
re3-d9a3533438ea0bf3ace712facfd01c9462390130.tar.bz2
re3-d9a3533438ea0bf3ace712facfd01c9462390130.tar.lz
re3-d9a3533438ea0bf3ace712facfd01c9462390130.tar.xz
re3-d9a3533438ea0bf3ace712facfd01c9462390130.tar.zst
re3-d9a3533438ea0bf3ace712facfd01c9462390130.zip
Diffstat (limited to 'src')
-rw-r--r--src/control/Curves.cpp2
-rw-r--r--src/core/templates.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/control/Curves.cpp b/src/control/Curves.cpp
index 623ab040..0a01a7aa 100644
--- a/src/control/Curves.cpp
+++ b/src/control/Curves.cpp
@@ -19,7 +19,7 @@ void CCurves::CalcCurvePoint(CVector* pPos1, CVector* pPos2, CVector* pDir1, CVe
float actualFactor = CalcSpeedScaleFactor(pPos1, pPos2, pDir1->x, pDir1->y, pDir2->x, pDir2->y);
CVector2D dir1 = *pDir1 * actualFactor;
CVector2D dir2 = *pDir2 * actualFactor;
- float curveCoef = 0.5f - 0.5f * cos(3.1415f * between);
+ float curveCoef = 0.5f - 0.5f * Cos(3.1415f * between);
*pOutPos = CVector(
(pPos1->x + between * dir1.x) * (1.0f - curveCoef) + (pPos2->x - (1 - between) * dir2.x) * curveCoef,
(pPos1->y + between * dir1.y) * (1.0f - curveCoef) + (pPos2->y - (1 - between) * dir2.y) * curveCoef,
diff --git a/src/core/templates.h b/src/core/templates.h
index 69844fa4..4f7b8490 100644
--- a/src/core/templates.h
+++ b/src/core/templates.h
@@ -131,7 +131,7 @@ public:
// TODO: the cast is unsafe
return (int)((U*)entry - m_entries);
}
- int GetNoOfUsedSpaces(void){
+ int GetNoOfUsedSpaces(void) const{
int i;
int n = 0;
for(i = 0; i < m_size; i++)