From 1111b6fb9d7db3d1434e03c859270e734219a528 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 25 Jan 2009 12:24:38 +0000 Subject: header sanitizing --- src/client/hud.h | 1 + src/client/view.cc | 2 +- src/core/application.h | 6 +++--- src/core/core.cc | 1 + src/core/core.h | 14 +------------- src/core/netserver.cc | 1 + src/dedicated/console.cc | 2 ++ src/dedicated/dedicated.cc | 1 + src/game/base/game.h | 4 +++- src/game/intro/convoy.h | 2 +- src/game/intro/intro.h | 6 +++++- src/render/camera.cc | 3 ++- src/render/draw.cc | 3 ++- src/render/draw.h | 2 ++ src/render/dust.cc | 4 ++-- src/render/render.cc | 3 ++- src/render/state.cc | 2 +- src/ui/console.cc | 2 ++ src/ui/inputbox.cc | 3 ++- src/ui/ui.cc | 1 + 20 files changed, 36 insertions(+), 27 deletions(-) (limited to 'src') diff --git a/src/client/hud.h b/src/client/hud.h index 6882239..23fa544 100644 --- a/src/client/hud.h +++ b/src/client/hud.h @@ -7,6 +7,7 @@ #ifndef __INCLUDED_CLIENT_HUD_H__ #define __INCLUDED_CLIENT_HUD_H__ +#include "core/gameinterface.h" #include "ui/bitmap.h" #include "ui/toolbar.h" #include "ui/widget.h" diff --git a/src/client/view.cc b/src/client/view.cc index 86f9af0..6631f95 100644 --- a/src/client/view.cc +++ b/src/client/view.cc @@ -19,7 +19,7 @@ #include "client/video.h" #include "client/view.h" #include "render/render.h" -#include "core/core.h" +#include "core/stats.h" #include "math/mathlib.h" #include "sys/sys.h" #include "ui/paint.h" diff --git a/src/core/application.h b/src/core/application.h index f335e26..b2d8467 100644 --- a/src/core/application.h +++ b/src/core/application.h @@ -8,12 +8,12 @@ #define __INCLUDED_CORE_APPLICATION_H__ #include "sys/sys.h" + #include "core/commandbuffer.h" +#include "core/cvar.h" +#include "core/func.h" #include "core/message.h" -#include "core/netserver.h" -#include "core/netconnection.h" #include "core/gameinterface.h" -#include "core/module.h" namespace core { diff --git a/src/core/core.cc b/src/core/core.cc index 0f68ab3..f511ee7 100644 --- a/src/core/core.cc +++ b/src/core/core.cc @@ -7,6 +7,7 @@ #include #include "core.h" +#include "sys/sys.h" namespace core { diff --git a/src/core/core.h b/src/core/core.h index 80f6d54..91cf72a 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -9,19 +9,7 @@ #include -#include "core/application.h" -#include "core/commandbuffer.h" -#include "core/cvar.h" -#include "core/entity.h" -#include "core/func.h" -#include "core/gameinterface.h" -#include "core/module.h" -#include "core/player.h" -#include "core/range.h" -#include "core/stats.h" -#include "core/zone.h" - -/// core contains the basic functionality of the engine +/// core functions of the engine namespace core { diff --git a/src/core/netserver.cc b/src/core/netserver.cc index 6838e34..62d9b74 100644 --- a/src/core/netserver.cc +++ b/src/core/netserver.cc @@ -23,6 +23,7 @@ #include #include "sys/sys.h" +#include "core/application.h" #include "core/gameserver.h" #include "core/netclient.h" #include "core/netserver.h" diff --git a/src/dedicated/console.cc b/src/dedicated/console.cc index 3790d93..852b028 100644 --- a/src/dedicated/console.cc +++ b/src/dedicated/console.cc @@ -12,7 +12,9 @@ #include #include "auxiliary/functions.h" +#include "core/application.h" #include "core/core.h" +#include "core/commandbuffer.h" #include "dedicated/console.h" #include "sys/consoleinterface.h" diff --git a/src/dedicated/dedicated.cc b/src/dedicated/dedicated.cc index 8f47180..15860a3 100644 --- a/src/dedicated/dedicated.cc +++ b/src/dedicated/dedicated.cc @@ -8,6 +8,7 @@ #include #include "core/core.h" +#include "core/cvar.h" #include "core/stats.h" #include "core/timer.h" #include "dedicated/console.h" diff --git a/src/game/base/game.h b/src/game/base/game.h index 9f31f4f..0ea0d37 100644 --- a/src/game/base/game.h +++ b/src/game/base/game.h @@ -13,7 +13,9 @@ #include "base/ship.h" #include "base/shipmodel.h" #include "base/star.h" -#include "core/core.h" +#include "core/module.h" +#include "core/application.h" +#include "core/gameinterface.h" #include "filesystem/inifile.h" #include "sys/sys.h" diff --git a/src/game/intro/convoy.h b/src/game/intro/convoy.h index 14016f4..2002164 100644 --- a/src/game/intro/convoy.h +++ b/src/game/intro/convoy.h @@ -9,7 +9,7 @@ #include -#include "core/core.h" +#include "core/entity.h" #include "math/color.h" namespace intro { diff --git a/src/game/intro/intro.h b/src/game/intro/intro.h index 2e2f8fb..d6d8393 100644 --- a/src/game/intro/intro.h +++ b/src/game/intro/intro.h @@ -7,7 +7,11 @@ #ifndef __INCLUDED_INTRO_H__ #define __INCLUDED_INTRO_H__ -#include "core/core.h" +#include "core/module.h" +#include "core/player.h" +#include "core/cvar.h" +#include "core/entity.h" +#include "core/func.h" #include "intro/convoy.h" /// introduction game module diff --git a/src/render/camera.cc b/src/render/camera.cc index a020947..91a7095 100644 --- a/src/render/camera.cc +++ b/src/render/camera.cc @@ -6,7 +6,8 @@ #include -#include "core/core.h" +#include "core/application.h" +#include "core/gameinterface.h" #include "math/mathlib.h" #include "math/matrix4f.h" #include "render/camera.h" diff --git a/src/render/draw.cc b/src/render/draw.cc index 61030b4..1c8dd31 100644 --- a/src/render/draw.cc +++ b/src/render/draw.cc @@ -7,7 +7,8 @@ #include #include -#include "core/core.h" +#include "core/application.h" +#include "core/gameinterface.h" #include "core/range.h" #include "model/fragment.h" #include "model/material.h" diff --git a/src/render/draw.h b/src/render/draw.h index 14ad2fa..bb42067 100644 --- a/src/render/draw.h +++ b/src/render/draw.h @@ -7,6 +7,8 @@ #ifndef __INCLUDED_RENDER_DRAW_H__ #define __INCLUDED_RENDER_DRAW_H__ +#include "core/gameinterface.h" + #include "math/axis.h" #include "math/vector3f.h" diff --git a/src/render/dust.cc b/src/render/dust.cc index f84460d..89ef630 100644 --- a/src/render/dust.cc +++ b/src/render/dust.cc @@ -7,8 +7,8 @@ #include "render/camera.h" #include "render/dust.h" #include "render/gl.h" -#include "core/cvar.h" -#include "core/core.h" +#include "core/application.h" +#include "core/gameinterface.h" #include "math/functions.h" #include "sys/sys.h" diff --git a/src/render/render.cc b/src/render/render.cc index 7f6b02c..41aa96f 100644 --- a/src/render/render.cc +++ b/src/render/render.cc @@ -10,7 +10,8 @@ #include #include "auxiliary/functions.h" -#include "core/core.h" +#include "core/application.h" +#include "core/gameinterface.h" #include "filesystem/filesystem.h" #include "model/model.h" #include "render/gl.h" diff --git a/src/render/state.cc b/src/render/state.cc index 41ef158..996b94c 100644 --- a/src/render/state.cc +++ b/src/render/state.cc @@ -82,7 +82,7 @@ void State::clear() gl::cullface(GL_BACK); gl::frontface(GL_CCW); gl::disable(GL_CULL_FACE); - gl::disable(GL_DEPTH_TEST); + gl::disable(GL_DEPTH_TEST); gl::disable(GL_BLEND); gl::disable(GL_TEXTURE_2D); diff --git a/src/ui/console.cc b/src/ui/console.cc index 66ddf4e..5f7313b 100644 --- a/src/ui/console.cc +++ b/src/ui/console.cc @@ -10,7 +10,9 @@ #include "auxiliary/functions.h" #include "audio/audio.h" +#include "core/application.h" #include "core/core.h" +#include "core/gameinterface.h" #include "filesystem/filesystem.h" #include "render/gl.h" #include "ui/console.h" diff --git a/src/ui/inputbox.cc b/src/ui/inputbox.cc index 968038c..08b85be 100644 --- a/src/ui/inputbox.cc +++ b/src/ui/inputbox.cc @@ -7,7 +7,8 @@ #include "ui/inputbox.h" #include "ui/paint.h" #include "auxiliary/functions.h" -#include "core/core.h" +#include "math/functions.h" +#include "core/application.h" namespace ui { diff --git a/src/ui/ui.cc b/src/ui/ui.cc index de32db4..e9036c5 100644 --- a/src/ui/ui.cc +++ b/src/ui/ui.cc @@ -10,6 +10,7 @@ #include "audio/audio.h" #include "auxiliary/functions.h" #include "core/core.h" +#include "core/application.h" #include "filesystem/filesystem.h" #include "render/gl.h" #include "sys/sys.h" -- cgit v1.2.3