From a10cd4450be10443c9ac2fa04ac9e5769b0bf98d Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Mon, 1 May 2017 01:27:23 +0200 Subject: [PATCH] Slight spectator adjustment. --- Source/Client/Player.c | 6 +++--- Source/Server/Spawn.c | 2 +- freecs/csprogs.dat | Bin 177834 -> 177834 bytes freecs/progs.dat | Bin 183242 -> 183242 bytes 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Client/Player.c b/Source/Client/Player.c index bfb70926..d7978f4d 100755 --- a/Source/Client/Player.c +++ b/Source/Client/Player.c @@ -32,10 +32,10 @@ float Player_PreDraw( void ) { vector vOldVelocity = self.velocity; float fOldPMoveFlags = self.pmove_flags; - if ( getplayerkeyvalue( player_localnum, "*spectator" ) == "1" ) { - self.movetype = MOVETYPE_NOCLIP; - } else { + if ( getplayerkeyvalue( player_localnum, "*spectator" ) == "0" ) { self.movetype = MOVETYPE_WALK; + } else { + self.movetype = MOVETYPE_NOCLIP; } for ( int i = servercommandframe + 1; i <= clientcommandframe; i++ ) { diff --git a/Source/Server/Spawn.c b/Source/Server/Spawn.c index e711b4c9..6b06d3e0 100755 --- a/Source/Server/Spawn.c +++ b/Source/Server/Spawn.c @@ -201,7 +201,7 @@ void Spawn_MakeSpectator( void ) { setsize (self, '-16 -16 -16', '16 16 16'); self.view_ofs = self.velocity = '0 0 0'; - forceinfokey( self, "*spectator", "1" ); // Make sure we are known as a spectator + forceinfokey( self, "*spectator", "2" ); // Make sure we are known as a spectator // Clear all the ammo stuff for ( int i = 0; i < CS_WEAPON_COUNT; i++ ) { diff --git a/freecs/csprogs.dat b/freecs/csprogs.dat index 49844980616770297a071b6c6a02923a7640b3ff..6d2cbdc051708dbfb1135547e582091563693cd8 100644 GIT binary patch delta 5558 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 delta 5631 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 delta 24 gcmX>#o%_^u?uIRle*2hCbF~NTW85CFkEx0m0EDIq)c^nh