ChronosXYZ/sfcnr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "should fix http://forum.sfcnr.com/showthread.php?60956-nametags-off-doesn-t-keeps-deactivating"

Browse Source 
This reverts commit 874a6c821f.
This commit is contained in:
Steven Howard 2018-12-02 17:18:43 +00:00
parent 874a6c821f
commit f1cac84865
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gamemodes/irresistible/cnr/player.pwn
View File

@ -223,8 +223,7 @@ new
p_AimedAtPolice [ MAX_PLAYERS ], p_AimedAtPolice [ MAX_PLAYERS ],
bool: p_PassiveModeDisabled [ MAX_PLAYERS char ], bool: p_PassiveModeDisabled [ MAX_PLAYERS char ],
//p_PassiveModeExpireTimer [ MAX_PLAYERS ] = { -1, ... }, //p_PassiveModeExpireTimer [ MAX_PLAYERS ] = { -1, ... },
Text3D: p_PassiveModeLabel [ MAX_PLAYERS ] = { Text3D: INVALID_3DTEXT_ID }, Text3D: p_PassiveModeLabel [ MAX_PLAYERS ] = { Text3D: INVALID_3DTEXT_ID }
bool: p_NameTags [ MAX_PLAYERS char ] = false
; ;
/* ** Getters And Setters** */ /* ** Getters And Setters** */

10
gamemodes/sf-cnr.pwn
View File

@ -1501,10 +1501,6 @@ public OnPlayerSpawn( playerid )
CancelEdit( playerid ); CancelEdit( playerid );
HidePlayerHelpDialog( playerid ); HidePlayerHelpDialog( playerid );
// Name Tags
foreach( new pID : Player )
ShowPlayerNameTagForPlayer( playerid, pID, p_NameTags{ playerid } ? 1 : 0 );
// Money Bags // Money Bags
if ( p_MoneyBag{ playerid } && p_Class[ playerid ] != CLASS_POLICE ) // SetPlayerAttachedObject( playerid, 1, 1550, 1, 0.131999, -0.140999, 0.053999, 11.299997, 65.599906, 173.900054, 0.652000, 0.573000, 0.594000 ); if ( p_MoneyBag{ playerid } && p_Class[ playerid ] != CLASS_POLICE ) // SetPlayerAttachedObject( playerid, 1, 1550, 1, 0.131999, -0.140999, 0.053999, 11.299997, 65.599906, 173.900054, 0.652000, 0.573000, 0.594000 );
RemovePlayerAttachedObject( playerid, 1 ), SetPlayerAttachedObject( playerid, 1, 1210, 7, 0.302650, -0.002469, -0.193321, 296.124053, 270.396881, 8.941717, 1.000000, 1.000000, 1.000000 ); RemovePlayerAttachedObject( playerid, 1 ), SetPlayerAttachedObject( playerid, 1, 1210, 7, 0.302650, -0.002469, -0.193321, 296.124053, 270.396881, 8.941717, 1.000000, 1.000000, 1.000000 );
@ -3627,12 +3623,10 @@ CMD:whisper( playerid, params[ ] )
CMD:nametags( playerid, params[ ] ) CMD:nametags( playerid, params[ ] )
{ {
if ( strmatch( params, "off" ) ) { if ( strmatch( params, "off" ) ) {
foreach( new i : Player ) { ShowPlayerNameTagForPlayer( playerid, i, 0 ); } foreach(new i : Player) { ShowPlayerNameTagForPlayer( playerid, i, 0 ); }
p_NameTags{ playerid } = false;
SendClientMessage( playerid, 0x84aa63ff, "-> Name tags disabled" ); SendClientMessage( playerid, 0x84aa63ff, "-> Name tags disabled" );
} else if ( strmatch( params, "on" ) ) { } else if ( strmatch( params, "on" ) ) {
foreach( new i : Player ) { ShowPlayerNameTagForPlayer( playerid, i, 1 ); } foreach(new i : Player) { ShowPlayerNameTagForPlayer( playerid, i, 1 ); }
p_NameTags{ playerid } = true;
SendClientMessage( playerid, 0x84aa63ff, "-> Name tags enabled" ); SendClientMessage( playerid, 0x84aa63ff, "-> Name tags enabled" );
} }
else SendClientMessage( playerid, 0xa9c4e4ff, "-> /nametags [ON/OFF]" ); else SendClientMessage( playerid, 0xa9c4e4ff, "-> /nametags [ON/OFF]" );