From de8cca84be523765cf810591d81ce8df7eb787dd Mon Sep 17 00:00:00 2001 From: Lorenc Pekaj Date: Sun, 23 Dec 2018 00:56:55 +1100 Subject: [PATCH] moving admins cmd's into _admin.pwn --- .../cnr/commands/admin/_admin.pwn | 5 +++++ .../cnr/discord/discord_relay.pwn | 4 ++++ gamemodes/sf-cnr.pwn | 20 +------------------ 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/gamemodes/irresistible/cnr/commands/admin/_admin.pwn b/gamemodes/irresistible/cnr/commands/admin/_admin.pwn index cabc27d..32695e2 100644 --- a/gamemodes/irresistible/cnr/commands/admin/_admin.pwn +++ b/gamemodes/irresistible/cnr/commands/admin/_admin.pwn @@ -290,3 +290,8 @@ hook OnDialogResponse( playerid, dialogid, response, listitem, inputtext[ ] ) /* ** Modules ** */ #include "irresistible\cnr\commands\admin\admin_one.pwn" #include "irresistible\cnr\commands\admin\admin_two.pwn" +#include "irresistible\cnr\commands\admin\admin_three.pwn" +#include "irresistible\cnr\commands\admin\admin_four.pwn" +#include "irresistible\cnr\commands\admin\admin_five.pwn" +#include "irresistible\cnr\commands\admin\admin_six.pwn" +#include "irresistible\cnr\commands\admin\admin_rcon.pwn" diff --git a/gamemodes/irresistible/cnr/discord/discord_relay.pwn b/gamemodes/irresistible/cnr/discord/discord_relay.pwn index 7682d09..2d21272 100644 --- a/gamemodes/irresistible/cnr/discord/discord_relay.pwn +++ b/gamemodes/irresistible/cnr/discord/discord_relay.pwn @@ -36,6 +36,10 @@ new stock DCC_Role: discordRoleVoice ; +stock DCC_SendChannelMessageFormatted( DCC_Channel: channel, const format[ ], va_args< > ) { + return DCC_SendChannelMessage( channel, va_return( format, va_start< 2 > ) ); +} + /* ** Error Checking ** */ #if defined DISCORD_DISABLED stock DCC_SendChannelMessage( DCC_Channel: channel, const message[ ] ) { diff --git a/gamemodes/sf-cnr.pwn b/gamemodes/sf-cnr.pwn index 3aff3b1..9370742 100644 --- a/gamemodes/sf-cnr.pwn +++ b/gamemodes/sf-cnr.pwn @@ -72,8 +72,7 @@ new bool: False = false; /* Beast Functions */ #define SendClientMessageToVips(%1,%2,%3) \ do{foreach(new fI : Player){if (p_VIPLevel[fI]>=VIP_REGULAR)format(szNormalString,sizeof(szNormalString),(%2),%3),SendClientMessage(fI,(%1),szNormalString);}}while(False) -#define DCC_SendChannelMessageFormatted(%0,%1,%2) \ - do{format(szNormalString,sizeof(szNormalString),(%1),%2),DCC_SendChannelMessage(%0,szNormalString);}while(False) + #define CreateBillboard(%0,%1,%2,%3,%4) SetDynamicObjectMaterialText(CreateDynamicObject(7246,%1,%2,%3,0,0,%4),0,(%0),120,"Arial",24,0,-1,-16777216,1) @@ -4928,23 +4927,6 @@ CMD:rape( playerid, params[ ] ) return 1; } -/* ________ ___ ___ ________ ___________ - /--------------\ / \ | \ / | | ___ \ / | - | ______ | | ______/ | \ / | | | | \ | _______| - | | | | | | | \/ | | | | | | \_______ - | |______| | ________ | | | | | | | | \_______ | - | ______ | |________| | | | |\__/| | | | | | / | - | | | | | |______ | | | | | | | | _______/ / - | | | | | \ | | | | |___| / | / - \___/ \___/ \__________/ |___| |___| |________/ |__________/ -*/ - -#include "irresistible\cnr\commands\admin\admin_three.pwn" // move to irresistible\cnr\commands\admin\_admin.pwn -#include "irresistible\cnr\commands\admin\admin_four.pwn" // move to irresistible\cnr\commands\admin\_admin.pwn -#include "irresistible\cnr\commands\admin\admin_five.pwn" // move to irresistible\cnr\commands\admin\_admin.pwn -#include "irresistible\cnr\commands\admin\admin_six.pwn" // move to irresistible\cnr\commands\admin\_admin.pwn -#include "irresistible\cnr\commands\admin\admin_rcon.pwn" // move to irresistible\cnr\commands\admin\_admin.pwn - public OnPlayerEnterVehicle(playerid, vehicleid, ispassenger) { new