Skip to content
This repository has been archived by the owner. It is now read-only.

Fix bug triggering gnNumTempPedList assertion #1257

Merged
merged 2 commits into from Jul 27, 2021
Merged
Changes from 1 commit
Commits
File filter
Filter file types
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev
Remove static_assert from previous commit
  • Loading branch information
Nopey committed Jul 27, 2021
commit 55e83982c31a18474a7789f1a966a25934ad37f8
@@ -393,7 +393,6 @@ CPed::BuildPedLists(void)
float dist = (ped->GetPosition() - GetPosition()).Magnitude2D();
if (nThreatReactionRangeMultiplier * 30.0f > dist) {
#ifdef FIX_BUGS
static_assert( ARRAY_SIZE(m_nearPeds) < ARRAY_SIZE(gapTempPedList) - 1, "gapTempPedList needs wiggle room for unsorted peds and nil slot" );
// If the gap ped list is full, sort it and truncate it
// before pushing more unsorted peds
if( gnNumTempPedList == ARRAY_SIZE(gapTempPedList) - 1 )

This comment has been minimized.

@erorcun

erorcun Jul 27, 2021
Collaborator

Instead of doing this, you can break all loops. It's clear that it can't continue further this point, because gapTempPedList will be full.