Skip to content

Commit

Permalink
Reworked AlertMessage
Browse files Browse the repository at this point in the history
  • Loading branch information
s1lentq committed Dec 14, 2023
1 parent 0af97d9 commit aebfb23
Showing 1 changed file with 36 additions and 31 deletions.
67 changes: 36 additions & 31 deletions rehlds/engine/sys_dll.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1150,46 +1150,51 @@ void EXT_FUNC EngineFprintf(void *pfile, const char *szFmt, ...)

void EXT_FUNC AlertMessage(ALERT_TYPE atype, const char *szFmt, ...)
{
char szOut[2048];
va_list argptr;
static char szOut[1024];

va_start(argptr, szFmt);
if (atype == at_logged && g_psvs.maxclients > 1)
{
va_start(argptr, szFmt);
Q_vsnprintf(szOut, sizeof(szOut), szFmt, argptr);
va_end(argptr);

Log_Printf("%s", szOut);
return;
}
else if (developer.value != 0.0f)

if (!developer.value)
return;

if (atype == at_aiconsole && developer.value < 2)
return;

va_start(argptr, szFmt);
Q_vsnprintf(szOut, sizeof(szOut), szFmt, argptr);
va_end(argptr);

switch (atype)
{
switch (atype)
{
case at_notice:
Q_strcpy(szOut, "NOTE: ");
break;
case at_console:
szOut[0] = 0;
break;
case at_aiconsole:
if (developer.value < 2.0f)
return;
szOut[0] = 0;
break;
case at_warning:
Q_strcpy(szOut, "WARNING: ");
break;
case at_error:
Q_strcpy(szOut, "ERROR: ");
break;
case at_logged:
break;
default:
break;
}
int iLen = Q_strlen(szOut);
Q_vsnprintf(&szOut[iLen], sizeof(szOut) - iLen, szFmt, argptr);
case at_notice:
Con_Printf("NOTE: %s", szOut);
break;
case at_console:
break;
case at_aiconsole:
Con_Printf("%s", szOut);
break;
case at_warning:
Con_Printf("WARNING: %s", szOut);
break;
case at_error:
Con_Printf("ERROR: %s", szOut);
break;
case at_logged:
Con_Printf("%s", szOut);
break;
default:
break;
}
va_end(argptr);
}

NOXREF void Sys_SplitPath(const char *path, char *drive, char *dir, char *fname, char *ext)
Expand Down Expand Up @@ -1326,7 +1331,7 @@ void Con_Printf(const char *fmt, ...)
va_start(va, fmt);
Q_vsnprintf(Dest, sizeof(Dest), fmt, va);
va_end(va);

g_RehldsHookchains.m_Con_Printf.callChain(Con_Printf_internal, Dest);
}

Expand Down

0 comments on commit aebfb23

Please sign in to comment.