avoid including bitmap.h in h files

This commit is contained in:
UnknownShadow200 2020-08-01 12:28:00 +10:00
parent e221e9f343
commit e13755b1d9
6 changed files with 6 additions and 4 deletions

View File

@ -1,11 +1,11 @@
#ifndef CC_GAME_H
#define CC_GAME_H
#include "String.h"
#include "Bitmap.h"
/* Represents the game and related structures.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
*/
struct Bitmap;
struct Stream;
CC_VAR extern struct _GameData {
/* Width and height of the window. (1 at minimum) */

View File

@ -11,6 +11,7 @@
#include "ExtMath.h"
#include "Errors.h"
#include "Options.h"
#include "Bitmap.h"
/* Avoid pointless includes on Windows */
#define WIN32_LEAN_AND_MEAN

View File

@ -1,12 +1,12 @@
#ifndef CC_GFXAPI_H
#define CC_GFXAPI_H
#include "Vectors.h"
#include "Bitmap.h"
#include "PackedCol.h"
/* Abstracts a 3D graphics rendering API.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
*/
struct Bitmap;
struct Stream;
struct IGameComponent;
extern struct IGameComponent Gfx_Component;

View File

@ -1,11 +1,11 @@
#ifndef CC_UTILS_H
#define CC_UTILS_H
#include "String.h"
#include "Bitmap.h"
/* Implements various utility functions.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
*/
struct Bitmap;
/* Represents a particular instance in time in some timezone. Not necessarily UTC time. */
/* NOTE: TimeMS and DateTime_CurrentUTC_MS() should almost always be used instead. */
/* This struct should only be used when actually needed. (e.g. log message time) */

View File

@ -5,6 +5,7 @@
#include "Logger.h"
#include "Funcs.h"
#include "ExtMath.h"
#include "Bitmap.h"
struct _DisplayData DisplayInfo;
struct _WinData WindowInfo;

View File

@ -1,7 +1,6 @@
#ifndef CC_WINDOW_H
#define CC_WINDOW_H
#include "String.h"
#include "Bitmap.h"
/* Abstracts creating and managing the native window.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3 | Based on OpenTK code
*/
@ -31,6 +30,7 @@
OTHER DEALINGS IN THE SOFTWARE.
*/
struct Bitmap;
struct DynamicLibSym;
/* The states the window can be in. */
enum WindowState { WINDOW_STATE_NORMAL, WINDOW_STATE_MINIMISED, WINDOW_STATE_FULLSCREEN };