Allow turning off the jetpack or HoloDuke while looking through a security monitor

git-svn-id: https://svn.eduke32.com/eduke32@5697 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2016-04-13 04:03:59 +00:00
parent 552c88b879
commit 5927047a3b

View file

@ -2772,7 +2772,7 @@ CHECKINV1:
} }
} }
if (TEST_SYNC_KEY(sb_snum, SK_HOLODUKE) && p->newowner == -1) if (TEST_SYNC_KEY(sb_snum, SK_HOLODUKE) && (p->newowner == -1 || p->holoduke_on != -1))
{ {
if (p->holoduke_on == -1) if (p->holoduke_on == -1)
{ {
@ -2832,7 +2832,7 @@ CHECKINV1:
} }
} }
if (p->newowner == -1 && TEST_SYNC_KEY(sb_snum, SK_JETPACK)) if ((p->newowner == -1 || p->jetpack_on) && TEST_SYNC_KEY(sb_snum, SK_JETPACK))
{ {
if (VM_OnEvent(EVENT_USEJETPACK,g_player[snum].ps->i,snum) == 0) if (VM_OnEvent(EVENT_USEJETPACK,g_player[snum].ps->i,snum) == 0)
{ {