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

code cleaning

Browse Source
This commit is contained in:
Stev 2018-12-25 16:35:25 +00:00
parent 8855e91de7
commit 99e1c77bb6
2 changed files with 35 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
gamemodes/irresistible/cnr/features/duel.pwn
View File

@ -362,16 +362,16 @@ CMD:duel( playerid, params[ ] )
new new
targetid; targetid;
if ( sscanf( params[7], "u", targetid) ) if ( sscanf( params[ 7 ], "u", targetid ) )
return SendUsage( playerid, "/duel accept [PLAYER_ID]"); return SendUsage( playerid, "/duel accept [PLAYER_ID]");
if ( !IsPlayerConnected( targetid )) if ( !IsPlayerConnected( targetid ) )
return SendError( playerid, "You do not have any duel invitations to accept."); return SendError( playerid, "You do not have any duel invitations to accept.");
if ( gettime() > p_duelInvitation[ targetid ][ playerid ] ) if ( gettime( ) > p_duelInvitation[ targetid ][ playerid ] )
return SendError( playerid, "You have not been invited by %s to duel or it has expired."); return SendError( playerid, "You have not been invited by %s to duel or it has expired.");
if ( IsPlayerDueling( playerid )) if ( IsPlayerDueling( playerid ) )
return SendError( playerid, "You cannot accept this invite as you are currently dueling."); return SendError( playerid, "You cannot accept this invite as you are currently dueling.");
if ( GetDistanceBetweenPlayers( playerid, targetid ) > 25.0) if ( GetDistanceBetweenPlayers( playerid, targetid ) > 25.0)
@ -380,15 +380,15 @@ CMD:duel( playerid, params[ ] )
new new
waged_amount = g_duelData[ targetid ][ E_BET ]; waged_amount = g_duelData[ targetid ][ E_BET ];
if (g_duelData[ targetid ][ E_BET ] != 0) if ( g_duelData[ targetid ][ E_BET ] != 0 )
{ {
if ( GetPlayerCash( targetid ) < waged_amount) if ( GetPlayerCash( targetid ) < waged_amount )
{ {
SendClientMessageFormatted( targetid, -1, ""COL_DUEL"[DUEL]"COL_WHITE" %s has accepted but you don't have money to wage (%s).", ReturnPlayerName( playerid ), cash_format( waged_amount ) ); SendClientMessageFormatted( targetid, -1, ""COL_DUEL"[DUEL]"COL_WHITE" %s has accepted but you don't have money to wage (%s).", ReturnPlayerName( playerid ), cash_format( waged_amount ) );
SendClientMessageFormatted( playerid, -1, ""COL_DUEL"[DUEL]"COL_WHITE" You have accepted %s's duel invitation but they don't have money.", ReturnPlayerName( targetid ) ); SendClientMessageFormatted( playerid, -1, ""COL_DUEL"[DUEL]"COL_WHITE" You have accepted %s's duel invitation but they don't have money.", ReturnPlayerName( targetid ) );
return 1; return 1;
} }
else if ( GetPlayerCash( playerid ) < waged_amount) else if ( GetPlayerCash( playerid ) < waged_amount )
{ {
SendClientMessageFormatted( playerid, -1, ""COL_DUEL"[DUEL]"COL_WHITE" %s requires you to wage %s.", ReturnPlayerName( targetid ), cash_format( waged_amount ) ); SendClientMessageFormatted( playerid, -1, ""COL_DUEL"[DUEL]"COL_WHITE" %s requires you to wage %s.", ReturnPlayerName( targetid ), cash_format( waged_amount ) );
SendClientMessageFormatted( targetid, -1, ""COL_DUEL"[DUEL]"COL_WHITE" %s has accepted the duel invitation but they don't have money to wage.", ReturnPlayerName( playerid ) ); SendClientMessageFormatted( targetid, -1, ""COL_DUEL"[DUEL]"COL_WHITE" %s has accepted the duel invitation but they don't have money to wage.", ReturnPlayerName( playerid ) );
@ -451,9 +451,9 @@ CMD:duel( playerid, params[ ] )
} }
return 1; return 1;
} }
else if (strmatch(params, "cancel")) else if ( strmatch( params, "cancel" ) )
{ {
if ( ClearDuelInvites( playerid )) if ( ClearDuelInvites( playerid ) )
{ {
return SendServerMessage( playerid, "You have cancelled every duel offer that you have made." ); return SendServerMessage( playerid, "You have cancelled every duel offer that you have made." );
} }
@ -486,7 +486,7 @@ stock IsPlayerDueling( playerid ) {
return p_playerDueling{ playerid }; return p_playerDueling{ playerid };
} }
stock ShowPlayerDuelMenu(playerid) stock ShowPlayerDuelMenu( playerid )
{ {
if ( p_Class[ playerid ] != CLASS_CIVILIAN ) if ( p_Class[ playerid ] != CLASS_CIVILIAN )
return SendError( playerid, "You can only use this feature whist being a civilian."); return SendError( playerid, "You can only use this feature whist being a civilian.");
@ -496,7 +496,7 @@ stock ShowPlayerDuelMenu(playerid)
format( szBigString, sizeof(szBigString), format( szBigString, sizeof(szBigString),
"Player\t"COL_GREY"%s\nHealth\t"COL_GREY"%.2f%%\nArmour\t"COL_GREY"%.2f%%\nPrimary Weapon\t"COL_GREY"%s\nSecondary Weapon\t"COL_GREY"%s\nLocation\t"COL_GREY"%s\nWager\t"COL_GREY"%s\n"COL_GOLD"Send Invite\t"COL_GOLD">>>", "Player\t"COL_GREY"%s\nHealth\t"COL_GREY"%.2f%%\nArmour\t"COL_GREY"%.2f%%\nPrimary Weapon\t"COL_GREY"%s\nSecondary Weapon\t"COL_GREY"%s\nLocation\t"COL_GREY"%s\nWager\t"COL_GREY"%s\n"COL_GOLD"Send Invite\t"COL_GOLD">>>",
(!IsPlayerConnected(g_duelData[ playerid ][ E_PLAYER ]) ? (""COL_RED"No-one") : (ReturnPlayerName( g_duelData[ playerid ][ E_PLAYER ] ) ) ), ( ! IsPlayerConnected( g_duelData[ playerid ][ E_PLAYER ] ) ? ( ""COL_RED"No-one" ) : ( ReturnPlayerName( g_duelData[ playerid ][ E_PLAYER ] ) ) ),
g_duelData[ playerid ][ E_HEALTH ], g_duelData[ playerid ][ E_HEALTH ],
g_duelData[ playerid ][ E_ARMOUR ], g_duelData[ playerid ][ E_ARMOUR ],
ReturnWeaponName( g_duelData[ playerid ][ E_WEAPON ][ 0 ] ), ReturnWeaponName( g_duelData[ playerid ][ E_WEAPON ][ 0 ] ),
@ -505,13 +505,13 @@ stock ShowPlayerDuelMenu(playerid)
cash_format( g_duelData[ playerid ][ E_BET ] ) cash_format( g_duelData[ playerid ][ E_BET ] )
); );
ShowPlayerDialog(playerid, DIALOG_DUEL, DIALOG_STYLE_TABLIST, ""COL_WHITE"Duel Settings", szBigString, "Select", "Cancel"); ShowPlayerDialog( playerid, DIALOG_DUEL, DIALOG_STYLE_TABLIST, ""COL_WHITE"Duel Settings", szBigString, "Select", "Cancel" );
return 1; return 1;
} }
static stock forfeitPlayerDuel(playerid) static stock forfeitPlayerDuel(playerid)
{ {
if ( !IsPlayerDueling( playerid )) if ( !IsPlayerDueling( playerid ) )
return 0; return 0;
ClearDuelInvites( playerid ); ClearDuelInvites( playerid );
@ -519,22 +519,22 @@ static stock forfeitPlayerDuel(playerid)
new new
winnerid = g_duelData[ playerid ][ E_PLAYER ]; winnerid = g_duelData[ playerid ][ E_PLAYER ];
if ( ! IsPlayerConnected( winnerid ) || ! IsPlayerDueling( winnerid )) if ( ! IsPlayerConnected( winnerid ) || ! IsPlayerDueling( winnerid ) )
return 0; return 0;
// begin wager info // begin wager info
new new
amount_waged = g_duelData[ playerid ][ E_BET ]; amount_waged = g_duelData[ playerid ][ E_BET ];
SpawnPlayer(winnerid); SpawnPlayer( winnerid );
ClearDuelInvites(winnerid); ClearDuelInvites( winnerid );
// decrement rounds // decrement rounds
g_duelData[ playerid ][ E_ROUNDS ] --; g_duelData[ playerid ][ E_ROUNDS ] --;
g_duelData[ winnerid ][ E_ROUNDS ] = g_duelData[ playerid ][ E_ROUNDS ]; g_duelData[ winnerid ][ E_ROUNDS ] = g_duelData[ playerid ][ E_ROUNDS ];
// check if theres a remaining round // check if theres a remaining round
if (g_duelData[ playerid ][ E_ROUNDS ] == 0) if ( g_duelData[ playerid ][ E_ROUNDS ] == 0)
{ {
if ( 0 < amount_waged < 10000000 ) if ( 0 < amount_waged < 10000000 )
{ {
@ -552,10 +552,10 @@ static stock forfeitPlayerDuel(playerid)
return 1; return 1;
} }
function OnDuelTimer(targetid) function OnDuelTimer( targetid )
{ {
new new
playerid = g_duelData[targetid][ E_PLAYER ]; playerid = g_duelData[ targetid ][ E_PLAYER ];
g_duelData[ targetid ][ E_COUNTDOWN ] --; g_duelData[ targetid ][ E_COUNTDOWN ] --;
@ -574,7 +574,7 @@ function OnDuelTimer(targetid)
} }
else else
{ {
format(szSmallString, sizeof(szSmallString), "~w~%d", g_duelData[ targetid ][ E_COUNTDOWN ]); format( szSmallString, sizeof( szSmallString ), "~w~%d", g_duelData[ targetid ][ E_COUNTDOWN ] );
GameTextForPlayer( targetid, szSmallString, 1500, 4 ); GameTextForPlayer( targetid, szSmallString, 1500, 4 );
GameTextForPlayer( playerid, szSmallString, 1500, 4 ); GameTextForPlayer( playerid, szSmallString, 1500, 4 );

33
gamemodes/irresistible/cnr/features/pool.pwn
View File

@ -10,20 +10,17 @@
//#include < physics_dynamic > //#include < physics_dynamic >
/* ** Definitions ** */ /* ** Definitions ** */
#define POCKET_RADIUS 0.09 #define POCKET_RADIUS ( 0.09 )
#define POOL_TIMER_SPEED 30 #define POOL_TIMER_SPEED ( 30 )
#define DEFAULT_AIM 0.38 #define DEFAULT_AIM ( 0.38 )
#define DEFAULT_POOL_STRING "Pool Table\n{FFFFFF}Press ENTER To Play" #define DEFAULT_POOL_STRING "Pool Table\n{FFFFFF}Press ENTER To Play"
#define POOL_FEE_RATE 0.02 #define POOL_FEE_RATE ( 0.02 )
#define MAX_POOL_TABLES 48 #define MAX_POOL_TABLES ( 48 )
#define MAX_POOL_BALLS (16) // do not modify #define MAX_POOL_BALLS ( 16 ) // do not modify
//#define DIALOG_POOL_WAGER 3284
/* ** Macros ** */ /* ** Macros ** */
#define SendPoolMessage(%0,%1) \ #define SendPoolMessage(%0,%1) SendClientMessageFormatted(%0, -1, "{4B8774}[POOL] {E5861A}" # %1)
SendClientMessageFormatted(%0, -1, "{4B8774}[POOL] {E5861A}" # %1)
/* ** Constants (do not modify) ** */ /* ** Constants (do not modify) ** */
enum E_POOL_BALL_TYPE { enum E_POOL_BALL_TYPE {
@ -133,14 +130,14 @@ forward PlayPoolSound ( poolid, soundid );
hook OnScriptInit( ) hook OnScriptInit( )
{ {
// textdraws // textdraws
g_PoolTextdraw = TextDrawCreate(529.000000, 218.000000, "Power"); g_PoolTextdraw = TextDrawCreate( 529.000000, 218.000000, "Power" );
TextDrawBackgroundColor(g_PoolTextdraw, 255); TextDrawBackgroundColor( g_PoolTextdraw, 255 );
TextDrawFont(g_PoolTextdraw, 1); TextDrawFont( g_PoolTextdraw, 1 );
TextDrawLetterSize(g_PoolTextdraw, 0.300000, 1.299998); TextDrawLetterSize( g_PoolTextdraw, 0.300000, 1.299998 );
TextDrawColor(g_PoolTextdraw, -1); TextDrawColor( g_PoolTextdraw, -1 );
TextDrawSetOutline(g_PoolTextdraw, 1); TextDrawSetOutline( g_PoolTextdraw, 1 );
TextDrawSetProportional(g_PoolTextdraw, 1); TextDrawSetProportional( g_PoolTextdraw, 1 );
TextDrawSetSelectable(g_PoolTextdraw, 0); TextDrawSetSelectable( g_PoolTextdraw, 0 );
// create static pooltables // create static pooltables
CreatePoolTableEx( 510.10159, -84.83590, 998.9375, 90.00000, POOL_SKIN_DEFAULT, 11, 7, 54, 55, 56, 50, 52, 51, 15, 10, 21, 58, 48, 17, 36, 41, 22 ); CreatePoolTableEx( 510.10159, -84.83590, 998.9375, 90.00000, POOL_SKIN_DEFAULT, 11, 7, 54, 55, 56, 50, 52, 51, 15, 10, 21, 58, 48, 17, 36, 41, 22 );