[colobot] 38/145: Fixed code style warnings
Didier Raboud
odyx at moszumanska.debian.org
Mon Jul 11 12:56:15 UTC 2016
This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch debian/master
in repository colobot.
commit 98dd9f90c8fec2129b5dcc59f56c3741315a9659
Author: krzys-h <krzys_h at interia.pl>
Date: Sun Apr 3 13:06:39 2016 +0200
Fixed code style warnings
---
src/object/auto/autohouston.cpp | 4 ++--
src/ui/debug_menu.cpp | 9 +++++----
src/ui/debug_menu.h | 5 +++--
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/object/auto/autohouston.cpp b/src/object/auto/autohouston.cpp
index 9ace408..2853be8 100644
--- a/src/object/auto/autohouston.cpp
+++ b/src/object/auto/autohouston.cpp
@@ -17,10 +17,10 @@
* along with this program. If not, see http://gnu.org/licenses
*/
-
-#include <math/geometry.h>
#include "object/auto/autohouston.h"
+#include "math/geometry.h"
+
#include "object/old_object.h"
#include "ui/controls/interface.h"
diff --git a/src/ui/debug_menu.cpp b/src/ui/debug_menu.cpp
index 88e62c1..9239038 100644
--- a/src/ui/debug_menu.cpp
+++ b/src/ui/debug_menu.cpp
@@ -26,9 +26,10 @@
#include "level/robotmain.h"
-#include "object/object_create_params.h"
-#include "object/object_manager.h"
#include "object/object.h"
+#include "object/object_manager.h"
+
+#include "sound/sound.h"
#include "ui/controls/interface.h"
#include "ui/controls/window.h"
@@ -62,7 +63,7 @@ void CDebugMenu::ToggleInterface()
const Math::Point dim = Math::Point(33.0f/640.0f, 33.0f/480.0f);
const float ox = 3.0f/640.0f, oy = 3.0f/480.0f;
-const float sx = 33.0f/640.0f, sy = 33.0f/480.0f;
+const float /*sx = 33.0f/640.0f,*/ sy = 33.0f/480.0f;
void CDebugMenu::CreateInterface()
{
@@ -426,4 +427,4 @@ bool CDebugMenu::HandleTeleport(Math::Point mousePos)
return true;
}
-}
\ No newline at end of file
+}
diff --git a/src/ui/debug_menu.h b/src/ui/debug_menu.h
index 2fb4b9d..a45623a 100644
--- a/src/ui/debug_menu.h
+++ b/src/ui/debug_menu.h
@@ -19,12 +19,13 @@
#pragma once
-#include <math/point.h>
-#include <sound/sound.h>
+#include "math/point.h"
+
#include "object/object_type.h"
class CRobotMain;
class CObjectManager;
+class CSoundInterface;
struct Event;
namespace Gfx
--
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