Skip to content
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

Jump to bottom

Add UTC option to FormatTime #1818

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add UTC option to FormatTime #1818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0dff2c
Add utc option to FormatTime
sirdigbot Aug 11, 2022
5ef3a3c
Fix old plugin compatibility
sirdigbot Apr 10, 2023
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
13 changes: 11 additions & 2 deletions core/logic/smn_core.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,17 @@ static cell_t FormatTime(IPluginContext *pContext, const cell_t *params)
#ifdef PLATFORM_WINDOWS
InvalidParameterHandler p;
#endif
t = (params[4] == -1) ? g_pSM->GetAdjustedTime() : (time_t)params[4];
written = strftime(buffer, params[2], format, localtime(&t));
// Older plugins dont have param[5]
if (params[0] < 5 || params[5])
{
t = (params[4] == -1) ? g_pSM->GetAdjustedTime() : (time_t)params[4];
written = strftime(buffer, params[2], format, localtime(&t));
}
else
{
t = (params[4] == -1) ? time(NULL) : (time_t)params[4];
written = strftime(buffer, params[2], format, gmtime(&t));
}
}

if (params[2] && format[0] != '\0' && !written)
Expand Down
4 changes: 3 additions & 1 deletion plugins/include/sourcemod.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,9 +407,11 @@ native int GetTime(int bigStamp[2]={0,0});
* @param maxlength Maximum length of output string buffer.
* @param format Formatting rules (passing NULL_STRING will use the rules defined in sm_datetime_format).
* @param stamp Optional time stamp.
* @param adjust If true, formatting will adjust for the local timezone and sm_time_adjustment value.
* If false, the time will be formatted for UTC/GMT.
* @error Buffer too small or invalid time format.
*/
native void FormatTime(char[] buffer, int maxlength, const char[] format, int stamp=-1);
native void FormatTime(char[] buffer, int maxlength, const char[] format, int stamp=-1, bool adjust=true);

/**
* Loads a game config file.
Expand Down