From 9dd5a1232f43e72ea13008caeed7b7de55dc21a2 Mon Sep 17 00:00:00 2001 From: Yimura Date: Fri, 23 Jul 2021 23:02:26 +0200 Subject: [PATCH] fix(Spectate): Don't force spectate unless it's explicitly enabled --- .../src/backend/looped/player/spectate.cpp | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/BigBaseV2/src/backend/looped/player/spectate.cpp b/BigBaseV2/src/backend/looped/player/spectate.cpp index cac80d5f..e984d997 100644 --- a/BigBaseV2/src/backend/looped/player/spectate.cpp +++ b/BigBaseV2/src/backend/looped/player/spectate.cpp @@ -4,16 +4,26 @@ namespace big { - static Ped spectated_ped = -1; - static bool bLastSpectating = false; + static bool bReset = true; void looped::player_specate() { - Ped player = PLAYER::GET_PLAYER_PED(g.selected_player.id); + if (!g.selected_player.is_online || !g.player.spectating) + { + if (g.player.spectating) g.player.spectating = false; - if (player != spectated_ped || (!bLastSpectating && bLastSpectating != g.player.spectating)) - g_pointers->m_spectate_player(g.player.spectating, player); + if (!bReset) + { + bReset = true; - bLastSpectating = g.player.spectating; + g_pointers->m_spectate_player(false, -1); + } + + return; + } + + g_pointers->m_spectate_player(true, PLAYER::GET_PLAYER_PED_SCRIPT_INDEX(g.selected_player.id)); + + bReset = false; } } \ No newline at end of file