[colobot] 32/100: Fix some code style
Didier Raboud
odyx at moszumanska.debian.org
Thu Jun 1 18:10:16 UTC 2017
This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch debian/master
in repository colobot.
commit 17511ddb6a10456a4e5e5b2ad5bd6f5a4b20377a
Author: krzys-h <krzys_h at interia.pl>
Date: Tue Dec 27 15:54:52 2016 +0100
Fix some code style
---
src/object/task/taskgoto.cpp | 12 ++++--------
src/ui/debug_menu.cpp | 4 ++--
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/object/task/taskgoto.cpp b/src/object/task/taskgoto.cpp
index 0da2de4..5d6cd47 100644
--- a/src/object/task/taskgoto.cpp
+++ b/src/object/task/taskgoto.cpp
@@ -1093,19 +1093,15 @@ CObject* CTaskGoto::SearchTarget(Math::Vector pos, float margin)
* See issue #732
*/
- CObject *pBest;
- Math::Vector oPos;
- float dist, min;
-
- pBest = 0;
- min = 1000000.0f;
+ CObject* pBest = nullptr;
+ float min = 1000000.0f;
for ( CObject* pObj : CObjectManager::GetInstancePointer()->GetAllObjects() )
{
if ( !pObj->GetActive() ) continue;
if ( IsObjectBeingTransported(pObj) ) continue; // object transtorted?
- oPos = pObj->GetPosition();
- dist = Math::DistanceProjected(pos, oPos);
+ Math::Vector oPos = pObj->GetPosition();
+ float dist = Math::DistanceProjected(pos, oPos);
if ( dist <= margin && dist <= min )
{
diff --git a/src/ui/debug_menu.cpp b/src/ui/debug_menu.cpp
index 1510e2b..a6eb6f6 100644
--- a/src/ui/debug_menu.cpp
+++ b/src/ui/debug_menu.cpp
@@ -19,11 +19,11 @@
#include "ui/debug_menu.h"
+#include "app/app.h"
+
#include "common/event.h"
#include "common/stringutils.h"
-#include "app/app.h"
-
#include "graphics/engine/lightning.h"
#include "graphics/engine/terrain.h"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git
More information about the Pkg-games-commits
mailing list