quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* fix: don't turn lights with targetname to styled for IBSP, as they are not switchable there

Browse Source
This commit is contained in:
Garux 2023-08-17 19:46:49 +06:00
parent 1da9dbfea9
commit a5bad3d471
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/quake3/q3map2/light.cpp
View File

@ -30,6 +30,7 @@
/* dependencies */ /* dependencies */
#include "q3map2.h" #include "q3map2.h"
#include "bspfile_rbsp.h"
@ -330,8 +331,8 @@ static void CreateEntityLights(){
continue; continue;
} }
/* lights with target names (and therefore styles) are only parsed from BSP */ /* lights with target names (and therefore styles in RBSP) are only parsed from BSP */
if ( !strEmpty( e.valueForKey( "targetname" ) ) && i >= numBSPEntities ) { if ( !strEmpty( e.valueForKey( "targetname" ) ) && g_game->load == LoadRBSPFile && i >= numBSPEntities ) {
continue; continue;
} }

7
tools/quake3/q3map2/writebsp.cpp
View File

@ -30,6 +30,7 @@
/* dependencies */ /* dependencies */
#include "q3map2.h" #include "q3map2.h"
#include "bspfile_rbsp.h"
@ -242,7 +243,7 @@ void SetLightStyles(){
/* ydnar: determine if we keep lights in the bsp */ /* ydnar: determine if we keep lights in the bsp */
entities[ 0 ].read_keyvalue( keepLights, "_keepLights" ); entities[ 0 ].read_keyvalue( keepLights, "_keepLights" );
/* any light that is controlled (has a targetname) must have a unique style number generated for it */ /* any light that is controlled (has a targetname) must have a unique style number generated for it in RBSP */
numStyles = 0; numStyles = 0;
for ( std::size_t i = 1; i < entities.size(); ++i ) for ( std::size_t i = 1; i < entities.size(); ++i )
{ {
@ -252,7 +253,7 @@ void SetLightStyles(){
continue; continue;
} }
const char *t; const char *t;
if ( !e.read_keyvalue( t, "targetname" ) ) { if ( !( e.read_keyvalue( t, "targetname" ) && g_game->load == LoadRBSPFile ) ) { // only RBSP has switchable light styles
/* ydnar: strip the light from the BSP file */ /* ydnar: strip the light from the BSP file */
if ( !keepLights ) { if ( !keepLights ) {
e.epairs.clear(); e.epairs.clear();
@ -461,7 +462,7 @@ void EmitFogs(){
} }
/* warn about overflow */ /* warn about overflow */
if( strEqual( g_game->bspIdent, "RBSP" ) ){ if( g_game->load == LoadRBSPFile ){
if( mapFogs.size() > MAX_RBSP_FOGS ) if( mapFogs.size() > MAX_RBSP_FOGS )
Sys_Warning( "MAX_RBSP_FOGS (%i) exceeded (%zu). Visual inconsistencies are expected.\n", MAX_RBSP_FOGS, mapFogs.size() ); Sys_Warning( "MAX_RBSP_FOGS (%i) exceeded (%zu). Visual inconsistencies are expected.\n", MAX_RBSP_FOGS, mapFogs.size() );
} }