From b9cb984081106923524eed68cc7f73023377c844 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sun, 16 Dec 2012 12:53:01 +0000
Subject: dded <cassert> include where required.
---
src/core/entity.cc | 1 +
src/core/inventory.cc | 2 ++
src/core/physics.cc | 8 +++++---
src/game/base/savegame.cc | 2 ++
src/game/base/ship.cc | 5 ++---
src/model/vertexarray.cc | 3 ++-
6 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/core/entity.cc b/src/core/entity.cc
index 4d8c4c7..ff15e6e 100644
--- a/src/core/entity.cc
+++ b/src/core/entity.cc
@@ -7,6 +7,7 @@
#include <vector>
#include <iomanip>
#include <cstring>
+#include <cassert>
#include "auxiliary/functions.h"
#include "sys/sys.h"
diff --git a/src/core/inventory.cc b/src/core/inventory.cc
index c10e1c6..645ddf8 100644
--- a/src/core/inventory.cc
+++ b/src/core/inventory.cc
@@ -4,6 +4,8 @@
the terms of the GNU General Public License version 2
*/
+#include <cassert>
+
#include "core/application.h"
#include "core/inventory.h"
#include "sys/sys.h"
diff --git a/src/core/physics.cc b/src/core/physics.cc
index 69c21f2..33e80fe 100644
--- a/src/core/physics.cc
+++ b/src/core/physics.cc
@@ -4,13 +4,15 @@
the terms and conditions of the GNU General Public License version 2
*/
-#include "model/collisionmesh.h"
-#include "core/physics.h"
-#include "core/zone.h"
+#include <cassert>
#include "btBulletDynamicsCommon.h"
#include "BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h"
+#include "model/collisionmesh.h"
+#include "core/physics.h"
+#include "core/zone.h"
+
namespace core {
/* ---- Bullet collision callbacks --------------------------------- */
diff --git a/src/game/base/savegame.cc b/src/game/base/savegame.cc
index 9bfe7b6..ce08659 100644
--- a/src/game/base/savegame.cc
+++ b/src/game/base/savegame.cc
@@ -4,6 +4,8 @@
the terms and conditions of the GNU General Public License version 2
*/
+#include <cassert>
+
#include "base/game.h"
#include "base/savegame.h"
#include "base/ship.h"
diff --git a/src/game/base/ship.cc b/src/game/base/ship.cc
index 46dba6e..a7695dd 100644
--- a/src/game/base/ship.cc
+++ b/src/game/base/ship.cc
@@ -5,19 +5,18 @@
the terms and conditions of the GNU General Public License version 2
*/
+#include <cassert>
#include <cmath>
+
#include <iostream>
#include "auxiliary/functions.h"
#include "math/functions.h"
-
#include "core/gameserver.h"
#include "core/entity.h"
#include "core/entityprojectile.h"
-
#include "base/game.h"
#include "base/ship.h"
-
#include "base/spacemine.h"
using math::degrees360f;
diff --git a/src/model/vertexarray.cc b/src/model/vertexarray.cc
index ae91f6c..0d3f64a 100644
--- a/src/model/vertexarray.cc
+++ b/src/model/vertexarray.cc
@@ -5,7 +5,8 @@
the terms of the GNU General Public License version 2
*/
-#include <string.h>
+#include <cstring>
+#include <cassert>
#include "math/mathlib.h"
#include "model/vertexarray.h"
--
cgit v1.2.3