mirror of
https://github.com/alliedmodders/sourcemod.git
synced 2025-12-07 18:38:37 +00:00
Fix incorrect handling of _condition_bits in TF2 extension (#2357)
Some checks failed
Continuous Integration / ${{ matrix.os_short }}-${{ matrix.compiler_cc }} (clang, clang++, ubuntu-latest, linux) (push) Has been cancelled
Continuous Integration / ${{ matrix.os_short }}-${{ matrix.compiler_cc }} (clang-14, clang++-14, ubuntu-22.04, linux) (push) Has been cancelled
Continuous Integration / ${{ matrix.os_short }}-${{ matrix.compiler_cc }} (msvc, windows-latest, win) (push) Has been cancelled
hl2sdk-mock tests / mock (push) Has been cancelled
SourcePawn scripting / build (ubuntu-latest, linux) (push) Has been cancelled
SourcePawn scripting / build (windows-latest, win) (push) Has been cancelled
Some checks failed
Continuous Integration / ${{ matrix.os_short }}-${{ matrix.compiler_cc }} (clang, clang++, ubuntu-latest, linux) (push) Has been cancelled
Continuous Integration / ${{ matrix.os_short }}-${{ matrix.compiler_cc }} (clang-14, clang++-14, ubuntu-22.04, linux) (push) Has been cancelled
Continuous Integration / ${{ matrix.os_short }}-${{ matrix.compiler_cc }} (msvc, windows-latest, win) (push) Has been cancelled
hl2sdk-mock tests / mock (push) Has been cancelled
SourcePawn scripting / build (ubuntu-latest, linux) (push) Has been cancelled
SourcePawn scripting / build (windows-latest, win) (push) Has been cancelled
This commit is contained in:
parent
e56a1ac2ef
commit
19dce02a9c
@ -57,25 +57,9 @@ void PlayerConditionsMgr::ProcessCondChange(CondChangeData_t *pCondData)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
int client = pCondData->hPlayer.GetEntryIndex();
|
int client = pCondData->hPlayer.GetEntryIndex();
|
||||||
int newConds = 0;
|
|
||||||
int prevConds = 0;
|
|
||||||
CondVar var = pCondData->var;
|
CondVar var = pCondData->var;
|
||||||
|
int newConds = pCondData->newConds;
|
||||||
if (var == m_nPlayerCond)
|
int prevConds = m_OldConds[client][var];
|
||||||
{
|
|
||||||
prevConds = m_OldConds[client][_condition_bits] | m_OldConds[client][var];
|
|
||||||
newConds = m_OldConds[client][_condition_bits] | pCondData->newConds;
|
|
||||||
}
|
|
||||||
else if (var == _condition_bits)
|
|
||||||
{
|
|
||||||
prevConds = m_OldConds[client][m_nPlayerCond] | m_OldConds[client][var];
|
|
||||||
newConds = m_OldConds[client][m_nPlayerCond] | pCondData->newConds;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
prevConds = m_OldConds[client][var];
|
|
||||||
newConds = pCondData->newConds;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (prevConds != newConds)
|
if (prevConds != newConds)
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user