forked from Mirrors/openclonk
Move StdColors.h ref from C4Surface.h to files that actually need it
C4Surface.h doesn't require anything from StdColors.h, so there's no reason to reference the latter there.liquid_container
parent
c9d3cd7417
commit
4fdafbc78a
|
@ -30,6 +30,7 @@
|
|||
#include <C4Version.h>
|
||||
#include "C4Viewport.h"
|
||||
#include <StdRegistry.h>
|
||||
#include "lib/StdColors.h"
|
||||
|
||||
#include <C4windowswrapper.h>
|
||||
#include <mmsystem.h>
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
#include <C4FacetEx.h>
|
||||
#include <C4Landscape.h>
|
||||
#include <C4GameObjects.h>
|
||||
#include "lib/StdColors.h"
|
||||
|
||||
C4TransferZone::C4TransferZone()
|
||||
{
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
#include <C4Config.h>
|
||||
#include "StdMesh.h"
|
||||
#include <CSurface8.h>
|
||||
#include "lib/StdColors.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
#include "C4Rect.h"
|
||||
#include "C4Config.h"
|
||||
#include <C4App.h>
|
||||
#include "lib/StdColors.h"
|
||||
|
||||
#ifndef USE_CONSOLE
|
||||
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
#include <C4Log.h>
|
||||
#include <C4Markup.h>
|
||||
#include <C4Surface.h>
|
||||
#include "StdColors.h"
|
||||
|
||||
#include <stdexcept>
|
||||
#include <string>
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
#include <Bitmap256.h>
|
||||
#include <StdPNG.h>
|
||||
#include <C4Config.h>
|
||||
#include "lib/StdColors.h"
|
||||
|
||||
|
||||
#ifdef HAVE_IO_H
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
#ifndef INC_StdSurface2
|
||||
#define INC_StdSurface2
|
||||
|
||||
#include <StdColors.h>
|
||||
#include <C4Rect.h>
|
||||
|
||||
#include <list>
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
#include <C4Group.h>
|
||||
#include <C4Log.h>
|
||||
#include <StdPNG.h>
|
||||
#include "lib/StdColors.h"
|
||||
|
||||
bool C4Surface::LoadAny(C4Group &hGroup, const char *szName, bool fOwnPal, bool fNoErrIfNotFound, int iFlags)
|
||||
{
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
#include <C4Game.h>
|
||||
#include <C4PlayerList.h>
|
||||
#include <C4GameControl.h>
|
||||
#include "lib/StdColors.h"
|
||||
|
||||
const int32_t C4MN_DefInfoWdt = 270, // default width of info windows
|
||||
C4MN_DlgWdt = 270, // default width of dialog windows
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
#include <C4Game.h>
|
||||
#include <C4PlayerList.h>
|
||||
#include <C4FullScreen.h>
|
||||
#include "lib/StdColors.h"
|
||||
|
||||
const int C4LogSize=30000, C4LogMaxLines=1000;
|
||||
|
||||
|
|
|
@ -40,6 +40,7 @@
|
|||
#include <C4Player.h>
|
||||
#include <C4PlayerList.h>
|
||||
#include <C4Viewport.h>
|
||||
#include "lib/StdColors.h"
|
||||
|
||||
#include <cmath>
|
||||
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
#include <C4GraphicsResource.h>
|
||||
#include <C4RankSystem.h>
|
||||
#include "gui/C4MouseControl.h"
|
||||
#include "lib/StdColors.h"
|
||||
#include <cctype>
|
||||
#include <algorithm>
|
||||
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
#include "C4LandscapeRender.h"
|
||||
#include "C4Landscape.h"
|
||||
#include "C4Texture.h"
|
||||
#include "lib/StdColors.h"
|
||||
|
||||
const int C4LS_MaxLightDistY = 8;
|
||||
const int C4LS_MaxLightDistX = 1;
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
#include <C4Random.h>
|
||||
#include <C4Weather.h>
|
||||
#include <C4Record.h>
|
||||
#include "lib/StdColors.h"
|
||||
|
||||
static const C4Real WindDrift_Factor = itofix(1, 800);
|
||||
|
||||
|
|
|
@ -48,6 +48,7 @@
|
|||
|
||||
#include <C4FacetEx.h>
|
||||
#include <C4GraphicsSystem.h>
|
||||
#include "lib/StdColors.h"
|
||||
|
||||
const int32_t C4PF_MaxDepth = 35,
|
||||
C4PF_MaxCrawl = 800,
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
#include <C4Components.h>
|
||||
#include <C4Weather.h>
|
||||
#include <C4GraphicsResource.h>
|
||||
#include "lib/StdColors.h"
|
||||
|
||||
void C4Sky::SetFadePalette(int32_t *ipColors)
|
||||
{
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
#include <C4Material.h>
|
||||
#include <C4Landscape.h>
|
||||
#include <C4Log.h>
|
||||
#include "lib/StdColors.h"
|
||||
|
||||
#include <ctype.h>
|
||||
#include <algorithm>
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
#include "C4FoWDrawStrategy.h"
|
||||
#include "C4PlayerList.h"
|
||||
#include "C4Player.h"
|
||||
#include "lib/StdColors.h"
|
||||
|
||||
#include <vector>
|
||||
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
#include <C4GameControl.h>
|
||||
#include <C4GraphicsResource.h>
|
||||
#include <C4Startup.h>
|
||||
#include "lib/StdColors.h"
|
||||
|
||||
#ifndef HAVE_WINSOCK
|
||||
#include <sys/socket.h>
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
#include <C4SoundSystem.h>
|
||||
#include <C4SolidMask.h>
|
||||
#include <CSurface8.h>
|
||||
#include "lib/StdColors.h"
|
||||
|
||||
// Helper class to load additional resources required for meshes from
|
||||
// a C4Group.
|
||||
|
|
|
@ -32,6 +32,7 @@
|
|||
#include <C4GameObjects.h>
|
||||
#include <C4GameControl.h>
|
||||
#include <C4RoundResults.h>
|
||||
#include "lib/StdColors.h"
|
||||
|
||||
C4PlayerList::C4PlayerList()
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue