Skip to content

Commit

Permalink
Fix null dereference in game_score
Browse files Browse the repository at this point in the history
  • Loading branch information
FreeSlave authored and JoelTroch committed Oct 16, 2024
1 parent 61e18e3 commit fcb7096
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@

* Added missing client side event for `func_vehicle` sounds
* Link Linux binaries with `-Wl` and `--no-undefined` flags to avoid situations where something was referenced but wasn't added in the build (Thanks a1batross)
* Prevent game_zone_player from transitioning across levels to fix Mod_NimForName: not found issue [#241](https://github.com/twhl-community/halflife-updated/pull/241) (Thanks FreeSlave)
* Prevented game_zone_player from transitioning across levels to fix Mod_NumForName: not found issue [#241](https://github.com/twhl-community/halflife-updated/pull/241) (Thanks FreeSlave)
* Fixed null dereference in game_score [#246](https://github.com/twhl-community/halflife-updated/pull/246) (Thanks FreeSlave)

### Features

Expand Down
3 changes: 2 additions & 1 deletion FULL_UPDATED_CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,8 @@ Fixes for bugs introduced in beta builds are not included in this list.
* Added cvar `sv_allowbunnyhopping` to control whether the bunny hopping limiter is enabled (halflife issue [#11](https://github.com/ValveSoftware/halflife/issues/11))
* Added `sv_load_all_maps` & `sv_stop_loading_all_maps` to help automate node graph generation
* Added missing client side event for `func_vehicle` sounds
* Prevent game_zone_player from transitioning across levels to fix Mod_NimForName: not found issue [#241](https://github.com/twhl-community/halflife-updated/pull/241) (Thanks FreeSlave)
* Prevented game_zone_player from transitioning across levels to fix Mod_NumForName: not found issue [#241](https://github.com/twhl-community/halflife-updated/pull/241) (Thanks FreeSlave)
* Fixed null dereference in game_score [#246](https://github.com/twhl-community/halflife-updated/pull/246) (Thanks FreeSlave)

## Code cleanup

Expand Down
2 changes: 1 addition & 1 deletion dlls/maprules.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ void CGameScore::Use(CBaseEntity* pActivator, CBaseEntity* pCaller, USE_TYPE use
return;

// Only players can use this
if (pActivator->IsPlayer())
if (pActivator && pActivator->IsPlayer())
{
if (AwardToTeam())
{
Expand Down

0 comments on commit fcb7096

Please sign in to comment.