summaryrefslogtreecommitdiff
path: root/src/engine/engine.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine/engine.h')
-rw-r--r--src/engine/engine.h79
1 files changed, 39 insertions, 40 deletions
diff --git a/src/engine/engine.h b/src/engine/engine.h
index a9d70ef..de7e525 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -13,7 +13,7 @@
#include "model.h"
extern dynent *player;
-extern physent *camera1; // special ent that acts as camera, same object as player1 in FPS mode
+extern physent *camera1; // special ent that acts as camera, same object as player1 in FPS mode
extern int worldscale, worldsize;
extern int mapversion;
@@ -36,18 +36,18 @@ extern vector<int> entgroup;
// rendertext
struct font
{
- struct charinfo
- {
- short x, y, w, h, offsetx, offsety, advance, tex;
- };
-
- char *name;
- vector<Texture *> texs;
- vector<charinfo> chars;
- int charoffset, defaultw, defaulth, scale;
-
- font() : name(NULL) {}
- ~font() { DELETEA(name); }
+ struct charinfo
+ {
+ short x, y, w, h, offsetx, offsety, advance, tex;
+ };
+
+ char *name;
+ vector<Texture *> texs;
+ vector<charinfo> chars;
+ int charoffset, defaultw, defaulth, scale;
+
+ font() : name(NULL) {}
+ ~font() { DELETEA(name); }
};
#define FONTH (curfont->scale)
@@ -131,7 +131,6 @@ extern void gl_init();
extern void gl_resize();
extern void cleanupgl();
extern void rendergame(bool mainpass = false);
-extern void invalidatepostfx();
extern void gl_drawhud();
extern void gl_drawframe();
extern void gl_drawmainmenu();
@@ -159,8 +158,8 @@ extern void writecrosshairs(stream *f);
namespace modelpreview
{
- extern void start(int x, int y, int w, int h, bool background = true);
- extern void end();
+ extern void start(int x, int y, int w, int h, bool background = true);
+ extern void end();
}
// renderextras
@@ -217,7 +216,7 @@ extern void mincubeface(const cube &cu, int orient, const ivec &o, int size, con
static inline cubeext &ext(cube &c)
{
- return *(c.ext ? c.ext : newcubeext(c));
+ return *(c.ext ? c.ext : newcubeext(c));
}
// ents
@@ -316,16 +315,16 @@ extern float reflectz;
extern int reflectdist, vertwater, waterrefract, waterreflect, waterfade, caustics, waterfallrefract;
#define GETMATIDXVAR(name, var, type) \
- type get##name##var(int mat) \
- { \
- switch(mat&MATF_INDEX) \
- { \
- default: case 0: return name##var; \
- case 1: return name##2##var; \
- case 2: return name##3##var; \
- case 3: return name##4##var; \
- } \
- }
+ type get##name##var(int mat) \
+ { \
+ switch(mat&MATF_INDEX) \
+ { \
+ default: case 0: return name##var; \
+ case 1: return name##2##var; \
+ case 2: return name##3##var; \
+ case 3: return name##4##var; \
+ } \
+ }
extern const bvec &getwatercolor(int mat);
extern const bvec &getwaterfallcolor(int mat);
@@ -408,17 +407,17 @@ extern void writecompletions(stream *f);
// main
enum
{
- NOT_INITING = 0,
- INIT_GAME,
- INIT_LOAD,
- INIT_RESET
+ NOT_INITING = 0,
+ INIT_GAME,
+ INIT_LOAD,
+ INIT_RESET
};
extern int initing, numcpus;
enum
{
- CHANGE_GFX = 1<<0,
- CHANGE_SOUND = 1<<1
+ CHANGE_GFX = 1<<0,
+ CHANGE_SOUND = 1<<1
};
extern bool initwarning(const char *desc, int level = INIT_RESET, int type = CHANGE_GFX);
@@ -485,13 +484,13 @@ extern void preloadusedmapmodels(bool msg = false, bool bih = false);
static inline model *loadmapmodel(int n)
{
- extern vector<mapmodelinfo> mapmodels;
- if(mapmodels.inrange(n))
- {
- model *m = mapmodels[n].m;
- return m ? m : loadmodel(NULL, n);
- }
- return NULL;
+ extern vector<mapmodelinfo> mapmodels;
+ if(mapmodels.inrange(n))
+ {
+ model *m = mapmodels[n].m;
+ return m ? m : loadmodel(NULL, n);
+ }
+ return NULL;
}
// renderparticles