okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' (early part) into sdl2

Browse source
This commit is contained in:
Zack Middleton 2014-03-24 17:51:57 -05:00
commit 73aa7ef2c7
28 changed files with 96 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

4
code/renderergl2/tr_local.h
View file

@ -698,6 +698,8 @@ typedef enum
UNIFORM_PRIMARYLIGHTAMBIENT,
UNIFORM_PRIMARYLIGHTRADIUS,
UNIFORM_CUBEMAPINFO,
UNIFORM_COUNT
} uniform_t;
@ -1179,8 +1181,6 @@ typedef struct {
int clusterBytes;
const byte *vis; // may be passed in by CM_LoadMap to save space
byte *novis; // clusterBytes of 0xff
char *entityString;
char *entityParsePoint;
} world_t;