Skip to content

Fix client crash by skipping bad overlays when compiling the bsp #1964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bottiger1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix client crash by skipping bad overlays when compiling the bsp #1964

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions src/utils/vbsp/writebsp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,16 +520,27 @@ void EmitFace( face_t *f, qboolean onNode )
side_t *pSide = f->originalface;
if ( pSide )
{
int nOverlayCount = pSide->aOverlayIds.Count();
if ( nOverlayCount > 0 )
// Overlays are only supported on world geometry (model 0). Binding one to
// a brush entity (entity_num != 0) bakes a face the engine resolves against
// the world brush, crashing clients on map load -- drop it instead.
if ( entity_num != 0 &&
( pSide->aOverlayIds.Count() > 0 || pSide->aWaterOverlayIds.Count() > 0 ) )
{
Overlay_AddFaceToLists( ( numfaces - 1 ), pSide );
Warning( "Overlay on brush entity %d skipped (overlays only work on world geometry).\n", entity_num );
}

nOverlayCount = pSide->aWaterOverlayIds.Count();
if ( nOverlayCount > 0 )
else
{
OverlayTransition_AddFaceToLists( ( numfaces - 1 ), pSide );
int nOverlayCount = pSide->aOverlayIds.Count();
if ( nOverlayCount > 0 )
{
Overlay_AddFaceToLists( ( numfaces - 1 ), pSide );
}

nOverlayCount = pSide->aWaterOverlayIds.Count();
if ( nOverlayCount > 0 )
{
OverlayTransition_AddFaceToLists( ( numfaces - 1 ), pSide );
}
}
}
}
Expand Down