mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-01-31 05:00:35 +00:00
Added merge notes.
This commit is contained in:
parent
46b5ce2d09
commit
bee8473715
1 changed files with 4 additions and 2 deletions
|
@ -50,6 +50,8 @@ typedef struct dlight_s
|
|||
float color[3]; // Don't use alpha --KB
|
||||
} dlight_t;
|
||||
|
||||
extern dlight_t r_dlights[MAX_DLIGHTS];
|
||||
|
||||
// FIXME client_state_t should hold all pieces of the client state
|
||||
typedef struct
|
||||
{
|
||||
|
@ -57,10 +59,10 @@ typedef struct
|
|||
char map[MAX_STYLESTRING];
|
||||
} lightstyle_t;
|
||||
|
||||
extern dlight_t r_dlights[MAX_DLIGHTS];
|
||||
|
||||
extern lightstyle_t r_lightstyle[MAX_LIGHTSTYLES];
|
||||
|
||||
// FIXME lightstyle_t and r_lightstyle were in client.h, is this the best place for them?
|
||||
|
||||
//===============
|
||||
|
||||
#define TOP_RANGE 16 // soldier uniform colors
|
||||
|
|
Loading…
Reference in a new issue