diff options
Diffstat (limited to 'src/Game.h')
| -rw-r--r-- | src/Game.h | 52 |
1 files changed, 16 insertions, 36 deletions
diff --git a/src/Game.h b/src/Game.h index 4835f42..5933e3a 100644 --- a/src/Game.h +++ b/src/Game.h @@ -22,22 +22,22 @@ #ifndef BLACKSHADES_GAME_H #define BLACKSHADES_GAME_H -#include <GLFW/glfw3.h> - -#include "config.h" -#include "misc.h" +#define num_blocks 100 +#define block_spacing 360 +#define max_people 90 +#define max_people_block 20 -#ifdef __cplusplus -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <ctype.h> -#include <cstdarg> +#include <stdbool.h> #include <AL/al.h> #include <GL/gl.h> +#include <GLFW/glfw3.h> #include "Quaternions.h" +#include "config.h" +#include "misc.h" + +#ifdef __cplusplus #include "Camera.h" #include "Skeleton.h" #include "Models.h" @@ -48,19 +48,7 @@ #include "Person.h" #include "Decals.h" -#define num_blocks 100 -#define block_spacing 360 -#define max_people 90 -#define max_people_block 20 - -class Game { - void handleMenu(); - void handleToggles(); - void mouseLook(); - XYZ aimPlayer(); - XYZ aimBot(int); - void setListener(XYZ&); -public: +struct Game { // Graphics int screenwidth, screenheight; float viewdistance; @@ -86,7 +74,7 @@ public: int cycle; bool whacked; float losedelay; - XYZ bodycoords; + struct XYZ bodycoords; FRUSTUM frustum; Model blocks[4]; @@ -100,7 +88,7 @@ public: Model Bigstreet; Model path; Model blocksimple; - XYZ boundingpoints[8]; + struct XYZ boundingpoints[8]; Text text; int goodkills; int badkills; @@ -113,12 +101,12 @@ public: bool paused; bool menu; - XYZ aimer[2]; + struct XYZ aimer[2]; double eqn[4]; float oldrot, oldrot2; - XYZ lastshot[2]; + struct XYZ lastshot[2]; bool zoom; int numpeople; @@ -153,19 +141,11 @@ public: int evilprobability; float difficulty; - // GL functions - GLvoid ReSizeGLScene(float fov, float near); - void DrawGLScene(); - - void updateSong(); - // Game functions + void DrawGLScene(); void Tick(); - void Splat(int k); }; #else // __cplusplus -#include <stdbool.h> - typedef struct Game Game; #endif // __cplusplus |