summaryrefslogtreecommitdiffstats
path: root/src/object/task
diff options
context:
space:
mode:
authorkrzys-h <krzys_h@interia.pl>2013-05-01 13:19:10 +0200
committerkrzys-h <krzys_h@interia.pl>2013-05-01 13:19:10 +0200
commit9e1870f6bdb24e278c06929b8bd13225a7fdf8d3 (patch)
treee95cb1832a1584ff2e6c5e02941a2d1f80c83bcd /src/object/task
parent293376b82d8fa313b17685b73c110a33123f9077 (diff)
downloadcolobot-9e1870f6bdb24e278c06929b8bd13225a7fdf8d3.tar.gz
colobot-9e1870f6bdb24e278c06929b8bd13225a7fdf8d3.tar.bz2
colobot-9e1870f6bdb24e278c06929b8bd13225a7fdf8d3.zip
Removed some warnings
+ fix for previous commit
Diffstat (limited to 'src/object/task')
-rw-r--r--src/object/task/taskbuild.cpp2
-rw-r--r--src/object/task/taskgoto.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/object/task/taskbuild.cpp b/src/object/task/taskbuild.cpp
index b9af475..39479a6 100644
--- a/src/object/task/taskbuild.cpp
+++ b/src/object/task/taskbuild.cpp
@@ -557,7 +557,7 @@ Error CTaskBuild::FlatFloor()
ObjectType type;
Math::Vector center, pos, oPos, bPos;
Math::Point c, p;
- float radius, max, oRadius, bRadius, angle, dist;
+ float radius, max, oRadius, bRadius = 0.0f, angle, dist;
int i, j;
bool bLittleFlat, bBase;
diff --git a/src/object/task/taskgoto.cpp b/src/object/task/taskgoto.cpp
index 3177131..97331dd 100644
--- a/src/object/task/taskgoto.cpp
+++ b/src/object/task/taskgoto.cpp
@@ -756,7 +756,7 @@ Error CTaskGoto::Start(Math::Vector goal, float altitude,
Error CTaskGoto::IsEnded()
{
Math::Vector pos;
- float limit, angle, dist, h, level;
+ float limit, angle = 0.0f, dist, h, level;
if ( m_engine->GetPause() ) return ERR_CONTINUE;
if ( m_error != ERR_OK ) return m_error;
@@ -1338,7 +1338,7 @@ bool CTaskGoto::GetHotPoint(CObject *pObj, Math::Vector &pos,
bool CTaskGoto::LeakSearch(Math::Vector &pos, float &delay)
{
- CObject *pObj, *pObstacle;
+ CObject *pObj, *pObstacle = nullptr;
Math::Vector iPos, oPos, bPos;
float iRadius, oRadius, bRadius, dist, min, dir;
int i, j;