Skip to content

fix: use R_ClearAllDecals for round reset #413

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

Merged
a1batross merged 2 commits into from
Sep 21, 2026
Merged

fix: use R_ClearAllDecals for round reset #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a05c5ec
client: events: use R_ClearAllDecals to clear decals for round reset
Vladislav4KZ Sep 19, 2026
dc8118b
cmake: fix Windows CI build race in yapb
Vladislav4KZ Sep 19, 2026
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
8 changes: 8 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,14 @@ if(BUILD_SERVER)
# INSTALL_COMMAND meson install -C build --destdir ${CMAKE_INSTALL_PREFIX}
# )
add_subdirectory(3rdparty/yapb)

if(MSVC)
# Limit YaPB to one concurrent compile job because MSVC shares one
# compiler PDB between all source files of this target.
set_property(GLOBAL APPEND PROPERTY JOB_POOLS yapb_compile_pool=1)
set_property(TARGET yapb PROPERTY JOB_POOL_COMPILE yapb_compile_pool)
endif()

set_target_postfix(yapb)

set(XASH_COMPAT ON CACHE BOOL "" FORCE)
Expand Down
6 changes: 2 additions & 4 deletions cl_dll/events/event_decal_reset.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
*/
#include <math.h>
#include "events.h"
#include "cl_dll.h"

// HACKHACK: This is very unreliable way to get round time
float g_flRoundTime = 0.0f;
Expand All @@ -35,11 +36,8 @@ extern TEMPENTITY *g_DeadPlayerModels[64];

void EV_DecalReset(event_args_s *args)
{
int decalnum = (int)(gEngfuncs.pfnGetCvarFloat("r_decals"));
gRenderAPI.R_ClearAllDecals( false );

for( int i = 0; i < decalnum; i++ )
gEngfuncs.pEfxAPI->R_DecalRemoveAll( i );

g_flRoundTime = gEngfuncs.GetClientTime();

if ( g_DeadPlayerModels )
Expand Down
2 changes: 1 addition & 1 deletion cl_dll/include/cl_dll.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ typedef unsigned short word;
typedef float vec_t;
typedef int (*pfnUserMsgHook)(const char *pszName, int iSize, void *pbuf);

#define MIN_XASH_VERSION 3137
#define MIN_XASH_VERSION 4190

#include <stdint.h>

Expand Down
1 change: 1 addition & 0 deletions common/render_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ typedef struct render_api_s
void (*S_FadeMusicVolume)( float fadePercent ); // fade background track (0-100 percents)
// a1ba: changed long to int
void (*SetRandomSeed)( int lSeed ); // set custom seed for RANDOM_FLOAT\RANDOM_LONG for predictable random
void (*R_ClearAllDecals)( qboolean includePermanent );
// ONLY ADD NEW FUNCTIONS TO THE END OF THIS STRUCT. INTERFACE VERSION IS FROZEN AT 37
} render_api_t;

Expand Down
Loading