• R/O
  • SSH

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-c誰得cocoaqtpythonrubywindowsphpgameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwitterdombtronvb.nettestarduinodirectxpreviewerゲームエンジン

This is a fork of Zandronum Beta for TSPG.


Commit MetaInfo

Revisionb5adf230291d7df401efff1a09e26f9c982a54b7 (tree)
Time2021-09-30 08:33:01
AuthorAdam Kaminski <kaminskiadam9@gmai...>
CommiterAdam Kaminski

Log Message

Fixed the crosshair from disappearing if the player used the chasecam cheat while spectating.

Change Summary

Incremental Difference

diff -r f6e16faa312d -r b5adf230291d src/g_shared/shared_sbar.cpp
--- a/src/g_shared/shared_sbar.cpp Thu Sep 30 09:31:02 2021 -0400
+++ b/src/g_shared/shared_sbar.cpp Wed Sep 29 19:33:01 2021 -0400
@@ -1145,7 +1145,12 @@
11451145
11461146 // Don't draw the crosshair in chasecam mode
11471147 if (players[consoleplayer].cheats & CF_CHASECAM)
1148- return;
1148+ {
1149+ // [AK] Still draw the crosshair if they're a spectator and spying on themelves, since the chasecam
1150+ // will be disabled for them anyways.
1151+ if (CLIENTDEMO_IsInFreeSpectateMode() || (players[consoleplayer].bSpectating && players[consoleplayer].camera != players[consoleplayer].mo))
1152+ return;
1153+ }
11491154
11501155 ST_LoadCrosshair();
11511156