ubergames/lilium-voyager
0
0
Fork 0
mirror of https://github.com/UberGames/lilium-voyager.git synced 2025-01-18 21:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed usage of various entity defines.

Browse source
This commit is contained in:
Zack Middleton 2011-11-05 01:02:35 +00:00
parent 4e59ef714b
commit 0724458818
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/cgame/cg_particles.c
View file

@ -1703,7 +1703,7 @@ qboolean ValidBloodPool (vec3_t start)
CG_Trace (&trace, this_pos, NULL, NULL, end_pos, -1, CONTENTS_SOLID);
if (trace.entityNum < (MAX_ENTITIES - 1)) // may only land on world
if (trace.entityNum < ENTITYNUM_WORLD) // may only land on world
return qfalse;
if (!(!trace.startsolid && trace.fraction < 1))

2
code/renderer/tr_local.h
View file

@ -836,7 +836,7 @@ the bits are allocated as follows:
*/
#define QSORT_FOGNUM_SHIFT 2
#define QSORT_ENTITYNUM_SHIFT 7
#define QSORT_SHADERNUM_SHIFT (QSORT_ENTITYNUM_SHIFT+GENTITYNUM_BITS)
#define QSORT_SHADERNUM_SHIFT (QSORT_ENTITYNUM_SHIFT+ENTITYNUM_BITS)
#if (QSORT_SHADERNUM_SHIFT+SHADERNUM_BITS) > 32
#error "Need to update sorting, too many bits."
#endif

2
code/renderer/tr_main.c
View file

@ -1127,7 +1127,7 @@ void R_DecomposeSort( unsigned sort, int *entityNum, shader_t **shader,
int *fogNum, int *dlightMap ) {
*fogNum = ( sort >> QSORT_FOGNUM_SHIFT ) & 31;
*shader = tr.sortedShaders[ ( sort >> QSORT_SHADERNUM_SHIFT ) & (MAX_SHADERS-1) ];
*entityNum = ( sort >> QSORT_ENTITYNUM_SHIFT ) & (MAX_GENTITIES-1);
*entityNum = ( sort >> QSORT_ENTITYNUM_SHIFT ) & MAX_ENTITIES;
*dlightMap = sort & 3;
}

4
code/renderer/tr_types.h
View file

@ -25,7 +25,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define MAX_DLIGHTS 32 // can't be increased, because bit flags are used on surfaces
#define MAX_ENTITIES 1023 // can't be increased without changing drawsurf bit packing
#define ENTITYNUM_BITS 10 // can't be increased without changing drawsurf bit packing
#define MAX_ENTITIES ((1<<ENTITYNUM_BITS) - 1)
// renderfx flags
#define RF_MINLIGHT 0x0001 // allways have some light (viewmodel, some items)