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

move player togglable textdraw stuff to module

Browse Source
This commit is contained in:
Lorenc Pekaj 2019-01-01 17:27:00 +11:00
parent 31f59fd719
commit e2c168561e
2 changed files with 44 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
gamemodes/irresistible/cnr/features/player/player_settings.pwn
View File

@ -109,6 +109,16 @@ hook OnPlayerLogin( playerid )
return 1; return 1;
} }
hook OnPlayerLoadTextdraws( playerid ) {
ShowPlayerTogglableTextdraws( playerid );
return 1;
}
hook OnPlayerUnloadTextdraws( playerid ) {
HidePlayerTogglableTextdraws( playerid );
return 1;
}
/* ** SQL Threads ** */ /* ** SQL Threads ** */
thread OnSettingsLoad( playerid ) thread OnSettingsLoad( playerid )
{ {
@ -181,6 +191,34 @@ CMD:passivelist( playerid, params[ ] )
} }
/* ** Functions ** */ /* ** Functions ** */
static stock ShowPlayerTogglableTextdraws( playerid, bool: force = false )
{
// Current Coins
if ( ! IsPlayerSettingToggled( playerid, SETTING_COINS_BAR ) || force ) {
TextDrawShowForPlayer( playerid, g_CurrentCoinsTD );
PlayerTextDrawShow( playerid, p_CoinsTD[ playerid ] );
}
// Top donor
if ( ! IsPlayerSettingToggled( playerid, SETTING_TOP_DONOR ) || force ) {
TextDrawShowForPlayer( playerid, g_TopDonorTD );
}
}
static stock HidePlayerTogglableTextdraws( playerid, bool: force = true )
{
// Current Coins
if ( IsPlayerSettingToggled( playerid, SETTING_COINS_BAR ) || force ) {
TextDrawHideForPlayer( playerid, g_CurrentCoinsTD );
PlayerTextDrawHide( playerid, p_CoinsTD[ playerid ] );
}
// Top donor
if ( IsPlayerSettingToggled( playerid, SETTING_TOP_DONOR ) || force ) {
TextDrawHideForPlayer( playerid, g_TopDonorTD );
}
}
stock TogglePlayerSetting( playerid, settingid, bool: toggle ) stock TogglePlayerSetting( playerid, settingid, bool: toggle )
{ {
if ( ( p_PlayerSettings[ playerid ] { settingid } = toggle ) == true ) { if ( ( p_PlayerSettings[ playerid ] { settingid } = toggle ) == true ) {
@ -197,4 +235,4 @@ stock IsPlayerSettingToggled( playerid, settingid ) {
stock IsPlayerVIPSkinToggled( playerid ) { stock IsPlayerVIPSkinToggled( playerid ) {
return p_PlayerSettings[ playerid ] { SETTING_VIPSKIN }; return p_PlayerSettings[ playerid ] { SETTING_VIPSKIN };
} }

43
gamemodes/sf-cnr.pwn
View File

@ -521,7 +521,6 @@ public OnPlayerRequestClass( playerid, classid )
p_TrackingTimer[ playerid ] = -1; p_TrackingTimer[ playerid ] = -1;
PlayerTextDrawHide( playerid, p_TrackPlayerTD[ playerid ] ); PlayerTextDrawHide( playerid, p_TrackPlayerTD[ playerid ] );
PlayerTextDrawHide( playerid, p_ExperienceTD[ playerid ] ); PlayerTextDrawHide( playerid, p_ExperienceTD[ playerid ] );
HidePlayerTogglableTextdraws( playerid );
TextDrawHideForPlayer( playerid, g_CurrentRankTD ); TextDrawHideForPlayer( playerid, g_CurrentRankTD );
TextDrawHideForPlayer( playerid, g_currentXPTD ); TextDrawHideForPlayer( playerid, g_currentXPTD );
TextDrawHideForPlayer( playerid, g_DoubleXPTD ); TextDrawHideForPlayer( playerid, g_DoubleXPTD );
@ -983,14 +982,13 @@ public OnPlayerSpawn( playerid )
DeletePVar( playerid, "attached_mugshot" ); DeletePVar( playerid, "attached_mugshot" );
PlayerPlaySound( playerid, 0, 0.0, 0.0, 0.0 ); PlayerPlaySound( playerid, 0, 0.0, 0.0, 0.0 );
PlayerTextDrawHide( playerid, p_ExperienceTD[ playerid ] );
HidePlayerTogglableTextdraws( playerid );
TextDrawHideForPlayer( playerid, g_CurrentRankTD );
TextDrawHideForPlayer( playerid, g_currentXPTD );
if ( ! IsPlayerMovieMode( playerid ) ) if ( IsPlayerMovieMode( playerid ) )
{
CallLocalFunction( "OnPlayerUnloadTextdraws", "d", playerid );
}
else
{ {
ShowPlayerTogglableTextdraws( playerid );
ShowPlayerIrresistibleRank( playerid ); ShowPlayerIrresistibleRank( playerid );
TextDrawShowForPlayer( playerid, g_CurrentRankTD ); TextDrawShowForPlayer( playerid, g_CurrentRankTD );
TextDrawShowForPlayer( playerid, g_currentXPTD ); TextDrawShowForPlayer( playerid, g_currentXPTD );
@ -1664,7 +1662,6 @@ public OnPlayerDeath( playerid, killerid, reason )
PlayerTextDrawHide( playerid, p_PlayerRankTextTD[ playerid ] ); PlayerTextDrawHide( playerid, p_PlayerRankTextTD[ playerid ] );
TextDrawHideForPlayer( playerid, g_CurrentRankTD ); TextDrawHideForPlayer( playerid, g_CurrentRankTD );
TextDrawHideForPlayer( playerid, g_currentXPTD ); TextDrawHideForPlayer( playerid, g_currentXPTD );
HidePlayerTogglableTextdraws( playerid );
CallLocalFunction( "OnPlayerUnloadTextdraws", "d", playerid ); CallLocalFunction( "OnPlayerUnloadTextdraws", "d", playerid );
/* ** Tax And Medical Fees ** /* ** Tax And Medical Fees **
@ -3284,7 +3281,6 @@ CMD:emp( playerid, params[ ] )
public OnPlayerLoadTextdraws( playerid ) public OnPlayerLoadTextdraws( playerid )
{ {
ShowPlayerTogglableTextdraws( playerid );
PlayerTextDrawShow( playerid, p_LocationTD[ playerid ] ); PlayerTextDrawShow( playerid, p_LocationTD[ playerid ] );
if ( IsDoubleXP( ) ) TextDrawShowForPlayer( playerid, g_DoubleXPTD ); if ( IsDoubleXP( ) ) TextDrawShowForPlayer( playerid, g_DoubleXPTD );
TextDrawShowForPlayer( playerid, g_WebsiteTD ); TextDrawShowForPlayer( playerid, g_WebsiteTD );
@ -3299,7 +3295,6 @@ public OnPlayerLoadTextdraws( playerid )
public OnPlayerUnloadTextdraws( playerid ) public OnPlayerUnloadTextdraws( playerid )
{ {
PlayerTextDrawHide( playerid, g_ZoneOwnerTD[ playerid ] ); PlayerTextDrawHide( playerid, g_ZoneOwnerTD[ playerid ] );
HidePlayerTogglableTextdraws( playerid );
PlayerTextDrawHide( playerid, p_LocationTD[ playerid ] ); PlayerTextDrawHide( playerid, p_LocationTD[ playerid ] );
PlayerTextDrawHide( playerid, p_WantedLevelTD[ playerid ] ); PlayerTextDrawHide( playerid, p_WantedLevelTD[ playerid ] );
TextDrawHideForPlayer( playerid, g_WebsiteTD ); TextDrawHideForPlayer( playerid, g_WebsiteTD );
@ -9525,34 +9520,6 @@ stock SetPlayerPosition( playerid, Float: x, Float: y, Float: z, interiorid = 0,
return SetPlayerPos( playerid, x, y, z ); return SetPlayerPos( playerid, x, y, z );
} }
stock ShowPlayerTogglableTextdraws( playerid, bool: force = false )
{
// Current Coins
if ( ! IsPlayerSettingToggled( playerid, SETTING_COINS_BAR ) || force ) {
TextDrawShowForPlayer( playerid, g_CurrentCoinsTD );
PlayerTextDrawShow( playerid, p_CoinsTD[ playerid ] );
}
// Top donor
if ( ! IsPlayerSettingToggled( playerid, SETTING_TOP_DONOR ) || force ) {
TextDrawShowForPlayer( playerid, g_TopDonorTD );
}
}
stock HidePlayerTogglableTextdraws( playerid, bool: force = true )
{
// Current Coins
if ( IsPlayerSettingToggled( playerid, SETTING_COINS_BAR ) || force ) {
TextDrawHideForPlayer( playerid, g_CurrentCoinsTD );
PlayerTextDrawHide( playerid, p_CoinsTD[ playerid ] );
}
// Top donor
if ( IsPlayerSettingToggled( playerid, SETTING_TOP_DONOR ) || force ) {
TextDrawHideForPlayer( playerid, g_TopDonorTD );
}
}
thread OnNewNameCheckBanned( playerid, Float: iCoinRequirement, newName[ ] ) thread OnNewNameCheckBanned( playerid, Float: iCoinRequirement, newName[ ] )
{ {
new new