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

Merge branch 'master' into game/eliteforce

Browse source
This commit is contained in:
Zack Middleton 2015-07-09 22:43:24 -05:00
commit c51801e4c9
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/renderergl1/tr_light.c
View file

@ -151,7 +151,7 @@ static void R_SetupEntityLightingGrid( trRefEntity_t *ent ) {
frac[i] = v - pos[i]; frac[i] = v - pos[i];
if ( pos[i] < 0 ) { if ( pos[i] < 0 ) {
pos[i] = 0; pos[i] = 0;
} else if ( pos[i] >= tr.world->lightGridBounds[i] - 1 ) { } else if ( pos[i] > tr.world->lightGridBounds[i] - 1 ) {
pos[i] = tr.world->lightGridBounds[i] - 1; pos[i] = tr.world->lightGridBounds[i] - 1;
} }
} }

4
code/renderergl2/tr_light.c
View file

@ -156,7 +156,7 @@ static void R_SetupEntityLightingGrid( trRefEntity_t *ent, world_t *world ) {
frac[i] = v - pos[i]; frac[i] = v - pos[i];
if ( pos[i] < 0 ) { if ( pos[i] < 0 ) {
pos[i] = 0; pos[i] = 0;
} else if ( pos[i] >= world->lightGridBounds[i] - 1 ) { } else if ( pos[i] > world->lightGridBounds[i] - 1 ) {
pos[i] = world->lightGridBounds[i] - 1; pos[i] = world->lightGridBounds[i] - 1;
} }
} }
@ -189,7 +189,7 @@ static void R_SetupEntityLightingGrid( trRefEntity_t *ent, world_t *world ) {
ignore = qfalse; ignore = qfalse;
for ( j = 0 ; j < 3 ; j++ ) { for ( j = 0 ; j < 3 ; j++ ) {
if ( i & (1<<j) ) { if ( i & (1<<j) ) {
if ((pos[j] + 1) >= world->lightGridBounds[j] - 1) if ((pos[j] + 1) > world->lightGridBounds[j] - 1)
{ {
ignore = qtrue; // ignore values outside lightgrid ignore = qtrue; // ignore values outside lightgrid
} }