cosmetic changes
This commit is contained in:
Dmitriy
parent
c2316dd8b1
commit
1d22832979
9 changed files with 436 additions and 434 deletions
|
|
@ -162,7 +162,7 @@ void DisplayMenuToClient (edict_t *ent, MenuText *menu)
|
|||
String tempText = String (menu->menuText);
|
||||
tempText.Replace ("\v", "\n");
|
||||
|
||||
char *text = locale->TranslateInput (tempText.GetBuffer ());
|
||||
char *text = locale.TranslateInput (tempText.GetBuffer ());
|
||||
tempText = String (text);
|
||||
|
||||
// make menu looks best
|
||||
|
|
@ -173,7 +173,7 @@ void DisplayMenuToClient (edict_t *ent, MenuText *menu)
|
|||
|
||||
while (strlen (text) >= 64)
|
||||
{
|
||||
MESSAGE_BEGIN (MSG_ONE_UNRELIABLE, netmsg->GetId (NETMSG_SHOWMENU), NULL, ent);
|
||||
MESSAGE_BEGIN (MSG_ONE_UNRELIABLE, netmsg.GetId (NETMSG_SHOWMENU), NULL, ent);
|
||||
WRITE_SHORT (menu->validSlots);
|
||||
WRITE_CHAR (-1);
|
||||
WRITE_BYTE (1);
|
||||
|
|
@ -186,7 +186,7 @@ void DisplayMenuToClient (edict_t *ent, MenuText *menu)
|
|||
text += 64;
|
||||
}
|
||||
|
||||
MESSAGE_BEGIN (MSG_ONE_UNRELIABLE, netmsg->GetId (NETMSG_SHOWMENU), NULL, ent);
|
||||
MESSAGE_BEGIN (MSG_ONE_UNRELIABLE, netmsg.GetId (NETMSG_SHOWMENU), NULL, ent);
|
||||
WRITE_SHORT (menu->validSlots);
|
||||
WRITE_CHAR (-1);
|
||||
WRITE_BYTE (0);
|
||||
|
|
@ -197,7 +197,7 @@ void DisplayMenuToClient (edict_t *ent, MenuText *menu)
|
|||
}
|
||||
else
|
||||
{
|
||||
MESSAGE_BEGIN (MSG_ONE_UNRELIABLE, netmsg->GetId (NETMSG_SHOWMENU), NULL, ent);
|
||||
MESSAGE_BEGIN (MSG_ONE_UNRELIABLE, netmsg.GetId (NETMSG_SHOWMENU), NULL, ent);
|
||||
WRITE_SHORT (0);
|
||||
WRITE_CHAR (0);
|
||||
WRITE_BYTE (0);
|
||||
|
|
@ -287,15 +287,8 @@ void DecalTrace (entvars_t *pev, TraceResult *trace, int logotypeIndex)
|
|||
void FreeLibraryMemory (void)
|
||||
{
|
||||
// this function free's all allocated memory
|
||||
waypoint->Init (); // frees waypoint data
|
||||
|
||||
FOR_EACH_AE (locale->m_langTab, it)
|
||||
{
|
||||
delete[] locale->m_langTab[it].original;
|
||||
delete[] locale->m_langTab[it].translated;
|
||||
}
|
||||
locale->m_langTab.RemoveAll ();
|
||||
|
||||
waypoint.Init (); // frees waypoint data
|
||||
locale.Destroy (); // clear language
|
||||
|
||||
delete [] g_experienceData;
|
||||
g_experienceData = NULL;
|
||||
|
|
@ -738,18 +731,18 @@ void RoundInit (void)
|
|||
g_roundEnded = false;
|
||||
|
||||
// check team economics
|
||||
botMgr->CheckTeamEconomics (TEAM_TF);
|
||||
botMgr->CheckTeamEconomics (TEAM_CF);
|
||||
botMgr.CheckTeamEconomics (TEAM_TF);
|
||||
botMgr.CheckTeamEconomics (TEAM_CF);
|
||||
|
||||
for (int i = 0; i < GetMaxClients (); i++)
|
||||
{
|
||||
if (botMgr->GetBot (i))
|
||||
botMgr->GetBot (i)->NewRound ();
|
||||
if (botMgr.GetBot (i))
|
||||
botMgr.GetBot (i)->NewRound ();
|
||||
|
||||
g_radioSelect[i] = 0;
|
||||
}
|
||||
waypoint->SetBombPosition (true);
|
||||
waypoint->ClearGoalScore ();
|
||||
waypoint.SetBombPosition (true);
|
||||
waypoint.ClearGoalScore ();
|
||||
|
||||
g_bombSayString = false;
|
||||
g_timeBombPlanted = 0.0;
|
||||
|
|
@ -798,7 +791,7 @@ bool IsValidPlayer (edict_t *ent)
|
|||
if (ent->v.flags & FL_PROXY)
|
||||
return false;
|
||||
|
||||
if ((ent->v.flags & (FL_CLIENT | FL_FAKECLIENT)) || botMgr->GetBot (ent) != NULL)
|
||||
if ((ent->v.flags & (FL_CLIENT | FL_FAKECLIENT)) || botMgr.GetBot (ent) != NULL)
|
||||
return !IsNullString (STRING (ent->v.netname));
|
||||
|
||||
return false;
|
||||
|
|
@ -817,7 +810,7 @@ bool IsPlayerVIP (edict_t *ent)
|
|||
|
||||
bool IsValidBot (edict_t *ent)
|
||||
{
|
||||
if (botMgr->GetBot (ent) != NULL || (!IsEntityNull (ent) && (ent->v.flags & FL_FAKECLIENT)))
|
||||
if (botMgr.GetBot (ent) != NULL || (!IsEntityNull (ent) && (ent->v.flags & FL_FAKECLIENT)))
|
||||
return true;
|
||||
|
||||
return false;
|
||||
|
|
@ -836,7 +829,7 @@ void ServerPrint (const char *format, ...)
|
|||
char string[3072];
|
||||
|
||||
va_start (ap, format);
|
||||
vsprintf (string, locale->TranslateInput (format), ap);
|
||||
vsprintf (string, locale.TranslateInput (format), ap);
|
||||
va_end (ap);
|
||||
|
||||
SERVER_PRINT (string);
|
||||
|
|
@ -849,7 +842,7 @@ void CenterPrint (const char *format, ...)
|
|||
char string[2048];
|
||||
|
||||
va_start (ap, format);
|
||||
vsprintf (string, locale->TranslateInput (format), ap);
|
||||
vsprintf (string, locale.TranslateInput (format), ap);
|
||||
va_end (ap);
|
||||
|
||||
if (IsDedicatedServer ())
|
||||
|
|
@ -858,7 +851,7 @@ void CenterPrint (const char *format, ...)
|
|||
return;
|
||||
}
|
||||
|
||||
MESSAGE_BEGIN (MSG_BROADCAST, netmsg->GetId (NETMSG_TEXTMSG));
|
||||
MESSAGE_BEGIN (MSG_BROADCAST, netmsg.GetId (NETMSG_TEXTMSG));
|
||||
WRITE_BYTE (HUD_PRINTCENTER);
|
||||
WRITE_STRING (FormatBuffer ("%s\n", string));
|
||||
MESSAGE_END ();
|
||||
|
|
@ -870,7 +863,7 @@ void ChartPrint (const char *format, ...)
|
|||
char string[2048];
|
||||
|
||||
va_start (ap, format);
|
||||
vsprintf (string, locale->TranslateInput (format), ap);
|
||||
vsprintf (string, locale.TranslateInput (format), ap);
|
||||
va_end (ap);
|
||||
|
||||
if (IsDedicatedServer ())
|
||||
|
|
@ -880,7 +873,7 @@ void ChartPrint (const char *format, ...)
|
|||
}
|
||||
strcat (string, "\n");
|
||||
|
||||
MESSAGE_BEGIN (MSG_BROADCAST, netmsg->GetId (NETMSG_TEXTMSG));
|
||||
MESSAGE_BEGIN (MSG_BROADCAST, netmsg.GetId (NETMSG_TEXTMSG));
|
||||
WRITE_BYTE (HUD_PRINTTALK);
|
||||
WRITE_STRING (string);
|
||||
MESSAGE_END ();
|
||||
|
|
@ -893,7 +886,7 @@ void ClientPrint (edict_t *ent, int dest, const char *format, ...)
|
|||
char string[2048];
|
||||
|
||||
va_start (ap, format);
|
||||
vsprintf (string, locale->TranslateInput (format), ap);
|
||||
vsprintf (string, locale.TranslateInput (format), ap);
|
||||
va_end (ap);
|
||||
|
||||
if (IsEntityNull (ent) || ent == g_hostEntity)
|
||||
|
|
@ -1037,7 +1030,7 @@ void CheckWelcomeMessage (void)
|
|||
WRITE_SHORT (FixedUnsigned16 (2, 1 << 8));
|
||||
WRITE_SHORT (FixedUnsigned16 (6, 1 << 8));
|
||||
WRITE_SHORT (FixedUnsigned16 (0.1, 1 << 8));
|
||||
WRITE_STRING (FormatBuffer ("\nServer is running YaPB v%s (Build: %u)\nDeveloped by %s\n\n%s", PRODUCT_VERSION, GenerateBuildNumber (), PRODUCT_AUTHOR, waypoint->GetInfo ()));
|
||||
WRITE_STRING (FormatBuffer ("\nServer is running YaPB v%s (Build: %u)\nDeveloped by %s\n\n%s", PRODUCT_VERSION, GenerateBuildNumber (), PRODUCT_AUTHOR, waypoint.GetInfo ()));
|
||||
MESSAGE_END ();
|
||||
|
||||
receiveTime = 0.0;
|
||||
|
|
@ -1113,7 +1106,7 @@ void AddLogEntry (bool outputToConsole, int logLevel, const char *format, ...)
|
|||
char buffer[512] = {0, }, levelString[32] = {0, }, logLine[1024] = {0, };
|
||||
|
||||
va_start (ap, format);
|
||||
vsprintf (buffer, locale->TranslateInput (format), ap);
|
||||
vsprintf (buffer, locale.TranslateInput (format), ap);
|
||||
va_end (ap);
|
||||
|
||||
switch (logLevel)
|
||||
|
|
@ -1217,6 +1210,17 @@ char *Localizer::TranslateInput (const char *input)
|
|||
return const_cast <char *> (&input[0]); // nothing found
|
||||
}
|
||||
|
||||
void Localizer::Destroy (void)
|
||||
{
|
||||
FOR_EACH_AE (m_langTab, it)
|
||||
{
|
||||
delete[] m_langTab[it].original;
|
||||
delete[] m_langTab[it].translated;
|
||||
}
|
||||
m_langTab.RemoveAll ();
|
||||
}
|
||||
|
||||
|
||||
bool FindNearestPlayer (void **pvHolder, edict_t *to, float searchDistance, bool sameTeam, bool needBot, bool isAlive, bool needDrawn)
|
||||
{
|
||||
// this function finds nearest to to, player with set of parameters, like his
|
||||
|
|
@ -1252,7 +1256,7 @@ bool FindNearestPlayer (void **pvHolder, edict_t *to, float searchDistance, bool
|
|||
|
||||
// fill the holder
|
||||
if (needBot)
|
||||
*pvHolder = reinterpret_cast <void *> (botMgr->GetBot (survive));
|
||||
*pvHolder = reinterpret_cast <void *> (botMgr.GetBot (survive));
|
||||
else
|
||||
*pvHolder = reinterpret_cast <void *> (survive);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue