diff --git a/gamemodes/irresistible/cnr/changelog.pwn b/gamemodes/irresistible/cnr/changelog.pwn index 0acb97a..4521e72 100644 --- a/gamemodes/irresistible/cnr/changelog.pwn +++ b/gamemodes/irresistible/cnr/changelog.pwn @@ -8,66 +8,83 @@ /* ** Includes ** */ #include < YSI\y_hooks > + #define GetServerVersion(%0) \ + ( "UNKNOWN" ) + #endinput /* ** Error Checking ** */ -#if !defined SERVER_CHANGES_FILE +#if !defined SERVER_CHANGES_DIRECTORY + + #endinput #endif +/* ** Definitions ** */ +#define CHANGELOG_INDEX_FILE ( SERVER_CHANGES_DIRECTORY # "/_changelogs.cfg" ) + /* ** Commands ** */ -CMD:changes( playerid, params[ ] ) return cmd_updates( playerid, params ); // Command by Cloudy & Sponyy -CMD:updates( playerid, params[ ] ) +// CMD:changes( playerid, params[ ] ) return cmd_updates( playerid, params ); // Command by Cloudy & Sponyy +// CMD:updates( playerid, params[ ] ) +// { +// new +// File: handle = fopen( SERVER_CHANGES_DIRECTORY # "/updates.txt", io_read ); + +// if ( ! handle ) +// return SendError( playerid, "There are no updates to show." ); + +// erase( szNormalString ); +// erase( szHugeString ); + +// while ( fread( handle, szNormalString ) ) +// { +// new +// find = strfind( szNormalString, "(+)" ); + +// // additions +// if( find != -1 ) +// { +// strins( szNormalString, "{23D96F}added{FFFFFF}\t\t", find + 3 ); +// strdel( szNormalString, find, find + 3); +// } + +// // removals +// find = strfind( szNormalString, "(-)" ); +// if( find != -1 ) +// { +// strins( szNormalString, "{D92323}removed{FFFFFF}\t", find + 3 ); +// strdel( szNormalString, find, find + 3 ); +// } + +// // fixes +// find = strfind( szNormalString, "(*)" ); +// if ( find != -1 ) +// { +// strins( szNormalString, "{D9A823}fixed{FFFFFF}\t\t", find + 3 ); +// strdel( szNormalString, find, find + 3 ); +// } + +// // fixes +// find = strfind( szNormalString, "(/)" ); +// if ( find != -1 ) +// { +// strins( szNormalString, "{c0c0c0}changed{FFFFFF}\t", find + 3 ); +// strdel( szNormalString, find, find + 3 ); +// } + +// // append +// strcat( szHugeString, szNormalString ); +// } + +// fclose( handle ); +// ShowPlayerDialog( playerid, DIALOG_NULL, DIALOG_STYLE_MSGBOX, sprintf( "{FFFFFF}Recent Updates - %s", GetServerVersion( ) ), szHugeString, "Okay", "" ); +// SendServerMessage( playerid, "You're now viewing the latest changes to the gamemode (version %s).", GetServerVersion( ) ); +// return 1; +// } + +/* ** Functions ** */ +stock GetServerVersion( ) { - new - File: handle = fopen( "updates.txt", io_read ); - - if ( ! handle ) - return SendError( playerid, "There are no updates to show." ); - - erase( szNormalString ); - erase( szHugeString ); - - while ( fread( handle, szNormalString ) ) - { - new - find = strfind( szNormalString, "(+)" ); - - // additions - if( find != -1 ) - { - strins( szNormalString, "{23D96F}added{FFFFFF}\t\t", find + 3 ); - strdel( szNormalString, find, find + 3); - } - - // removals - find = strfind( szNormalString, "(-)" ); - if( find != -1 ) - { - strins( szNormalString, "{D92323}removed{FFFFFF}\t", find + 3 ); - strdel( szNormalString, find, find + 3 ); - } - - // fixes - find = strfind( szNormalString, "(*)" ); - if ( find != -1 ) - { - strins( szNormalString, "{D9A823}fixed{FFFFFF}\t\t", find + 3 ); - strdel( szNormalString, find, find + 3 ); - } - - // fixes - find = strfind( szNormalString, "(/)" ); - if ( find != -1 ) - { - strins( szNormalString, "{c0c0c0}changed{FFFFFF}\t", find + 3 ); - strdel( szNormalString, find, find + 3 ); - } - - // append - strcat( szHugeString, szNormalString ); - } - - fclose( handle ); - ShowPlayerDialog( playerid, DIALOG_NULL, DIALOG_STYLE_MSGBOX, "{FFFFFF}Recent Updates - " #FILE_BUILD, szHugeString, "Okay", "" ); - SendServerMessage( playerid, "You're now viewing the latest changes to the gamemode (version "#FILE_BUILD")." ); - return 1; + static + version[ 32 ]; + printf( "Version: %s", version ); + return version; } \ No newline at end of file diff --git a/gamemodes/irresistible/cnr/commands/admin/admin_six.pwn b/gamemodes/irresistible/cnr/commands/admin/admin_six.pwn index 3bc5501..bc36451 100644 --- a/gamemodes/irresistible/cnr/commands/admin/admin_six.pwn +++ b/gamemodes/irresistible/cnr/commands/admin/admin_six.pwn @@ -320,7 +320,7 @@ CMD:svrstats( playerid, params[ ] ) return SendError( playerid, ADMIN_COMMAND_REJECT ); if ( strmatch( params, "version" ) ) - return SendServerMessage( playerid, "Current version is "COL_GREY"%s", FILE_BUILD ), 1; + return SendServerMessage( playerid, "Current version is "COL_GREY"%s", GetServerVersion( ) ), 1; if ( strmatch( params, "ticks" ) ) return SendServerMessage( playerid, "Current tick rate of server is: %d", GetServerTickRate( ) ), 1; diff --git a/gamemodes/irresistible/cnr/commands/cmd_changes.pwn b/gamemodes/irresistible/cnr/commands/cmd_changes.pwn deleted file mode 100644 index 0acb97a..0000000 --- a/gamemodes/irresistible/cnr/commands/cmd_changes.pwn +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Irresistible Gaming (c) 2018 - * Developed by Cloudy, Lorenc - * Module: cnr\commands\cmd_changes.pwn - * Purpose: /changes to show all changes by a player - */ - -/* ** Includes ** */ -#include < YSI\y_hooks > - -/* ** Error Checking ** */ -#if !defined SERVER_CHANGES_FILE - #endinput -#endif - -/* ** Commands ** */ -CMD:changes( playerid, params[ ] ) return cmd_updates( playerid, params ); // Command by Cloudy & Sponyy -CMD:updates( playerid, params[ ] ) -{ - new - File: handle = fopen( "updates.txt", io_read ); - - if ( ! handle ) - return SendError( playerid, "There are no updates to show." ); - - erase( szNormalString ); - erase( szHugeString ); - - while ( fread( handle, szNormalString ) ) - { - new - find = strfind( szNormalString, "(+)" ); - - // additions - if( find != -1 ) - { - strins( szNormalString, "{23D96F}added{FFFFFF}\t\t", find + 3 ); - strdel( szNormalString, find, find + 3); - } - - // removals - find = strfind( szNormalString, "(-)" ); - if( find != -1 ) - { - strins( szNormalString, "{D92323}removed{FFFFFF}\t", find + 3 ); - strdel( szNormalString, find, find + 3 ); - } - - // fixes - find = strfind( szNormalString, "(*)" ); - if ( find != -1 ) - { - strins( szNormalString, "{D9A823}fixed{FFFFFF}\t\t", find + 3 ); - strdel( szNormalString, find, find + 3 ); - } - - // fixes - find = strfind( szNormalString, "(/)" ); - if ( find != -1 ) - { - strins( szNormalString, "{c0c0c0}changed{FFFFFF}\t", find + 3 ); - strdel( szNormalString, find, find + 3 ); - } - - // append - strcat( szHugeString, szNormalString ); - } - - fclose( handle ); - ShowPlayerDialog( playerid, DIALOG_NULL, DIALOG_STYLE_MSGBOX, "{FFFFFF}Recent Updates - " #FILE_BUILD, szHugeString, "Okay", "" ); - SendServerMessage( playerid, "You're now viewing the latest changes to the gamemode (version "#FILE_BUILD")." ); - return 1; -} \ No newline at end of file diff --git a/gamemodes/irresistible/config/server.pwn b/gamemodes/irresistible/config/server.pwn index b4d1987..911b1f6 100644 --- a/gamemodes/irresistible/config/server.pwn +++ b/gamemodes/irresistible/config/server.pwn @@ -9,8 +9,6 @@ #include < YSI\y_hooks > /* ** Definitions ** */ -#define FILE_BUILD "v11.45.130" - #define SERVER_NAME "San Fierro Cops And Robbers (0.3.7)" #define SERVER_MODE_TEXT "Cops And Robbers / DM / Gangs" #define SERVER_MAP "San Fierro" @@ -23,7 +21,7 @@ #define SERVER_RULES_URL "files.sfcnr.com/en_rules.txt" // used for /rules (cnr\features\server_rules.pwn) #define SERVER_TWITTER_FEED_URL "files.sfcnr.com/cnr_twitter.php" // used for /twitter (cnr\commands\cmd_twitter.pwn) #define SERVER_HELP_API_URL "sfcnr.com/api/player/help" // used for /help (cnr\commands\cmd_help.pwn) -#define SERVER_CHANGES_FILE "updates.txt" // used for /changes (cnr\commands\cmd_changes.pwn) +#define SERVER_CHANGES_DIRECTORY "changelogs/cnr" // used for /changes (cnr\changelog.pwn) #define SERVER_PLS_DONATE_MP3 "http://files.sfcnr.com/game_sounds/pls_donate.mp3" // used for advertising vip (cnr\features\vip\coin_market.pwn) #define SERVER_MIGRATIONS_FOLDER "./gamemodes/irresistible/config/migrations/cnr/" // used for migrations checking (config\migrations\_migrations.pwn) diff --git a/gamemodes/sf-cnr.pwn b/gamemodes/sf-cnr.pwn index 2e2c0bf..2043622 100644 --- a/gamemodes/sf-cnr.pwn +++ b/gamemodes/sf-cnr.pwn @@ -148,7 +148,7 @@ public OnGameModeInit() rl_ServerUpdate = SetTimer( "OnServerUpdateTimer", 960, true ); rl_ZoneUpdate = SetTimer( "OnServerSecondTick", 980, true ); - printf( "[SF-CNR] SF-CnR has been successfully initialized. (Build: "#FILE_BUILD" | Time: %d | Tickcount: %d)", ( g_ServerUptime = gettime( ) ), GetTickCount( ) ); + printf( "[SF-CNR] SF-CnR has been successfully initialized. (Build: %s | Time: %d | Tickcount: %d)", GetServerVersion( ), ( g_ServerUptime = gettime( ) ), GetTickCount( ) ); return 1; } @@ -265,7 +265,7 @@ public OnServerUpdateTimer( ) { // AFK Jail if ( p_WantedLevel[ playerid ] >= 6 && p_InHouse[ playerid ] == -1 && !IsPlayerAdminOnDuty( playerid ) && !IsPlayerInEntrance( playerid, g_VIPLounge[ CITY_SF ] ) && !IsPlayerInEntrance( playerid, g_VIPLounge[ CITY_LV ] ) && !IsPlayerInEntrance( playerid, g_VIPLounge[ CITY_LS ] ) && !IsPlayerTied( playerid ) && !IsPlayerKidnapped( playerid ) && !IsPlayerCuffed( playerid ) && !IsPlayerTazed( playerid ) && IsPlayerSpawned( playerid ) ) { // && !IsPlayerDetained( playerid ) - + if ( !AwardNearestLEO( playerid, 1 ) ) { JailPlayer( playerid, 60, 1 ); @@ -431,7 +431,7 @@ public OnPlayerConnect( playerid ) jailDoors( playerid, false, false ); SendClientMessage( playerid, 0xa9c4e4ff, "{FF0000}[WARNING]{a9c4e4} The concept in this server and GTA in general may be considered explicit material." ); - SendClientMessage( playerid, 0xa9c4e4ff, "{FF0000}[INFO]{a9c4e4} The server is currently operating on version " # FILE_BUILD "." ); + SendClientMessageFormatted( playerid, 0xa9c4e4ff, "{FF0000}[INFO]{a9c4e4} The server is currently operating on version %s.", GetServerVersion( ) ); if ( IsValidServerVariable( "connectsong" ) ) { diff --git a/scriptfiles/changelogs/cnr/_changelogs.cfg b/scriptfiles/changelogs/cnr/_changelogs.cfg new file mode 100644 index 0000000..f741be1 --- /dev/null +++ b/scriptfiles/changelogs/cnr/_changelogs.cfg @@ -0,0 +1 @@ +v11.50.140 \ No newline at end of file diff --git a/scriptfiles/updates.txt b/scriptfiles/changelogs/cnr/v11.50.140.txt similarity index 100% rename from scriptfiles/updates.txt rename to scriptfiles/changelogs/cnr/v11.50.140.txt