Skip to content

refactor: use SourceMod 1.12 methodmaps #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rushaway merged 1 commit into from
Oct 21, 2026
Merged

refactor: use SourceMod 1.12 methodmaps #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions addons/sourcemod/scripting/VIP_Test.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ public Plugin myinfo =
name = "[VIP] Test",
author = "Loneypro",
description = "Players can test vip features for a set of time",
version = "1.0.9",
version = "1.0.10",
url = ""
};

Handle g_hDatabase;
Database g_hDatabase;
bool g_bDBMySQL;
int g_iTestTime;
int g_iTestInterval;
Expand All @@ -65,7 +65,7 @@ public void OnPluginStart()
{
ConVar hCvar = CreateConVar("sm_vip_test_group", "Test VIP", "Группа для тестового VIP-статуса / Test VIP group");
hCvar.AddChangeHook(OnTestGroupChange);
GetConVarString(hCvar, g_sTestGroup, sizeof(g_sTestGroup));
hCvar.GetString(g_sTestGroup, sizeof(g_sTestGroup));

ConVar hCvar1 = CreateConVar("sm_vip_test_time", "120", "На сколько времени выдавать тестовый VIP-статус (значение зависит от sm_vip_time_mode) / VIP-Test duration (value depends on sm_vip_time_mode)", 0, true, 0.0);
hCvar1.AddChangeHook(OnTestTimeChange);
Expand All @@ -90,11 +90,11 @@ public void OnPluginStart()

public void OnTestTimeChange(ConVar hCvar, const char[] oldVal, const char[] newVal)
{
g_iTestTime = GetConVarInt(hCvar);
g_iTestTime = hCvar.IntValue;
}
public void OnTestIntervalChange(ConVar hCvar, const char[] oldVal, const char[] newVal)
{
g_iTestInterval = GetConVarInt(hCvar);
g_iTestInterval = hCvar.IntValue;
}
public void OnTestGroupChange(ConVar hCvar, const char[] oldVal, const char[] newVal)
{
Expand Down Expand Up @@ -128,16 +128,16 @@ public void DB_OnConnect(Database db, const char[] sError, any data)
{
char sQuery[256];
Format(sQuery, sizeof(sQuery), "SET NAMES \"%s\"", DB_CHARSET);
SQL_TQuery(g_hDatabase, SQL_Callback_ErrorCheck, sQuery);
g_hDatabase.Query(SQL_Callback_ErrorCheck, sQuery);

Format(sQuery, sizeof(sQuery), "SET CHARSET \"%s\"", DB_CHARSET);
SQL_TQuery(g_hDatabase, SQL_Callback_ErrorCheck, sQuery);
g_hDatabase.Query(SQL_Callback_ErrorCheck, sQuery);
}

CreateTables();
}

public void SQL_Callback_ErrorCheck(Handle owner, Handle hndl, const char[] sError, any data)
public void SQL_Callback_ErrorCheck(Database owner, DBResultSet hndl, const char[] sError, any data)
{
if (sError[0])
{
Expand All @@ -155,11 +155,11 @@ stock void CreateTables()
`end` INT(10) UNSIGNED NOT NULL, \
PRIMARY KEY(`auth`)) \
DEFAULT CHARSET=%s COLLATE=%s;", DB_CHARSET, DB_COLLATION);
SQL_TQuery(g_hDatabase, SQL_Callback_ErrorCheck, sQuery);
g_hDatabase.Query(SQL_Callback_ErrorCheck, sQuery);
}
else
{
SQL_TQuery(g_hDatabase, SQL_Callback_ErrorCheck, "CREATE TABLE IF NOT EXISTS `vip_test` (\
g_hDatabase.Query(SQL_Callback_ErrorCheck, "CREATE TABLE IF NOT EXISTS `vip_test` (\
`auth` VARCHAR(24) NOT NULL PRIMARY KEY, \
`end` INTEGER UNSIGNED NOT NULL);");
}
Expand All @@ -169,14 +169,14 @@ public Action ClearTestVIP_CMD(int iClient, int args)
{
if (iClient)
{
SQL_TQuery(g_hDatabase, SQL_Callback_DropTable, "DROP TABLE `vip_test`;");
g_hDatabase.Query(SQL_Callback_DropTable, "DROP TABLE `vip_test`;");
}
return Plugin_Handled;
}

public void SQL_Callback_DropTable(Handle hOwner, Handle hQuery, const char[] sError, any data)
public void SQL_Callback_DropTable(Database hOwner, DBResultSet hQuery, const char[] sError, any data)
{
if (hQuery == INVALID_HANDLE)
if (hQuery == null)
{
LogError("SQL_Callback_DropTable: %s", sError);
return;
Expand Down Expand Up @@ -206,28 +206,28 @@ public Action TestVIP_CMD(int iClient, int args)
else
{
FormatEx(sQuery, sizeof(sQuery), "SELECT `end` FROM `vip_test` WHERE `auth` = '%s' LIMIT 1;", sAuth);
SQL_TQuery(g_hDatabase, SQL_Callback_SelectClient, sQuery, GetClientUserId(iClient));
g_hDatabase.Query(SQL_Callback_SelectClient, sQuery, GetClientUserId(iClient));
}
}
return Plugin_Handled;
}

public void SQL_Callback_SelectClient(Handle hOwner, Handle hQuery, const char[] sError, any UserID)
public void SQL_Callback_SelectClient(Database hOwner, DBResultSet hQuery, const char[] sError, any UserID)
{
int iClient = GetClientOfUserId(UserID);
if (iClient)
{
if (hQuery == INVALID_HANDLE)
if (hQuery == null)
{
LogError("SQL_Callback_SelectClient: %s", sError);
return;
}

if(SQL_FetchRow(hQuery))
if(hQuery.FetchRow())
{
if(g_iTestInterval > 0)
{
int iIntervalSeconds = SQL_FetchInt(hQuery, 0)+VIP_TimeToSeconds(g_iTestInterval),
int iIntervalSeconds = hQuery.FetchInt(0)+VIP_TimeToSeconds(g_iTestInterval),
iTime = GetTime();
if(iTime > iIntervalSeconds)
{
Expand All @@ -254,9 +254,9 @@ public void SQL_Callback_SelectClient(Handle hOwner, Handle hQuery, const char[]
}
}

public void SQL_Callback_InsertClient(Handle hOwner, Handle hQuery, const char[] sError, any data)
public void SQL_Callback_InsertClient(Database hOwner, DBResultSet hQuery, const char[] sError, any data)
{
if (hQuery == INVALID_HANDLE)
if (hQuery == null)
{
LogError("SQL_Callback_InsertClient: %s", sError);
return;
Expand All @@ -270,25 +270,25 @@ public void OnClientPostAdminCheck(int iClient)
char sQuery[256], sAuth[32];
GetClientAuthId(iClient, AuthId_Steam2, sAuth, sizeof(sAuth));
FormatEx(sQuery, sizeof(sQuery), "SELECT `end` FROM `vip_test` WHERE `auth` = '%s' LIMIT 1;", sAuth);
SQL_TQuery(g_hDatabase, SQL_Callback_SelectClientAuthorized, sQuery, GetClientUserId(iClient));
g_hDatabase.Query(SQL_Callback_SelectClientAuthorized, sQuery, GetClientUserId(iClient));
}
}

public void SQL_Callback_SelectClientAuthorized(Handle hOwner, Handle hQuery, const char[] sError, any UserID)
public void SQL_Callback_SelectClientAuthorized(Database hOwner, DBResultSet hQuery, const char[] sError, any UserID)
{
int iClient = GetClientOfUserId(UserID);
if (iClient)
{
if (hQuery == INVALID_HANDLE)
if (hQuery == null)
{
LogError("SQL_Callback_SelectClientAuthorized: %s", sError);
return;
}

if(SQL_FetchRow(hQuery))
if(hQuery.FetchRow())
{
int iEnd, iTime;
if((iEnd = SQL_FetchInt(hQuery, 0)) > (iTime = GetTime()) && !VIP_IsClientVIP(iClient))
if((iEnd = hQuery.FetchInt(0)) > (iTime = GetTime()) && !VIP_IsClientVIP(iClient))
{
VIP_GiveClientVIP(_, iClient, iEnd - iTime, g_sTestGroup, false);
}
Expand Down Expand Up @@ -323,5 +323,5 @@ stock void GiveVIPToClient(int iClient, bool bUpdate = false)
FormatEx(sQuery, sizeof(sQuery), "INSERT INTO `vip_test` (`auth`, `end`) VALUES ('%s', '%i');", sAuth, GetTime()+iSeconds);
}

SQL_TQuery(g_hDatabase, SQL_Callback_InsertClient, sQuery);
g_hDatabase.Query(SQL_Callback_InsertClient, sQuery);
}
Loading