UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge.

Browse Source
This commit is contained in:
Asher Baker 2012-05-27 01:56:15 +01:00
commit c6405bfb63
8 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/Logger.cpp
View File

@ -265,6 +265,8 @@ void Logger::LogToOpenFileEx(FILE *fp, const char *msg, va_list ap)
return; return;
} }
static ConVar *sv_logecho = icvar->FindVar("sv_logecho");
char buffer[3072]; char buffer[3072];
UTIL_FormatArgs(buffer, sizeof(buffer), msg, ap); UTIL_FormatArgs(buffer, sizeof(buffer), msg, ap);
@ -275,7 +277,11 @@ void Logger::LogToOpenFileEx(FILE *fp, const char *msg, va_list ap)
strftime(date, sizeof(date), "%m/%d/%Y - %H:%M:%S", curtime); strftime(date, sizeof(date), "%m/%d/%Y - %H:%M:%S", curtime);
fprintf(fp, "L %s: %s\n", date, buffer); fprintf(fp, "L %s: %s\n", date, buffer);
g_SMAPI->ConPrintf("L %s: %s\n", date, buffer);
if (!sv_logecho || sv_logecho->GetBool())
{
g_SMAPI->ConPrintf("L %s: %s\n", date, buffer);
}
} }
void Logger::LogToFileOnlyEx(FILE *fp, const char *msg, va_list ap) void Logger::LogToFileOnlyEx(FILE *fp, const char *msg, va_list ap)

4
core/MenuVoting.cpp
View File

@ -518,7 +518,7 @@ void VoteMenuHandler::OnMenuSelect(IBaseMenu *menu, int client, unsigned int ite
m_Votes[item]++; m_Votes[item]++;
m_NumVotes++; m_NumVotes++;
if (sm_vote_chat.GetBool() || sm_vote_console.GetBool()) if (sm_vote_chat.GetBool() || sm_vote_console.GetBool() || sm_vote_client_console.GetBool())
{ {
static char buffer[1024]; static char buffer[1024];
ItemDrawInfo dr; ItemDrawInfo dr;
@ -560,7 +560,7 @@ void VoteMenuHandler::OnMenuSelect(IBaseMenu *menu, int client, unsigned int ite
if (sm_vote_client_console.GetBool()) if (sm_vote_client_console.GetBool())
{ {
engine->ClientPrintf(pPlayer->GetEdict(), buffer); ClientConsolePrint(pPlayer->GetEdict(), buffer);
} }
} }
} }

2
core/logic/common_logic.cpp
View File

@ -62,7 +62,7 @@ IGameHelpers *gamehelpers;
static void AddCorePhraseFile(const char *filename) static void AddCorePhraseFile(const char *filename)
{ {
g_pCorePhrases->AddPhraseFile("antiflood.phrases"); g_pCorePhrases->AddPhraseFile(filename);
} }
static IGameConfig *GetCoreGameConfig() static IGameConfig *GetCoreGameConfig()

13
extensions/clientprefs/extension.cpp
View File

@ -202,6 +202,19 @@ void ClientPrefs::SDK_OnUnload()
cookieMutex->DestroyThis(); cookieMutex->DestroyThis();
} }
void ClientPrefs::OnCoreMapStart(edict_t *pEdictList, int edictCount, int clientMax)
{
if (Database == NULL && !databaseLoading)
{
g_pSM->LogMessage(myself, "Attempting to reconnect to database...");
databaseLoading = true;
TQueryOp *op = new TQueryOp(Query_Connect, 0);
dbi->AddToThreadQueue(op, PrioQueue_High);
}
}
void ClientPrefs::DatabaseConnect() void ClientPrefs::DatabaseConnect()
{ {
char error[256]; char error[256];

2
extensions/clientprefs/extension.h
View File

@ -87,6 +87,8 @@ public:
const char *GetExtensionVerString(); const char *GetExtensionVerString();
const char *GetExtensionDateString(); const char *GetExtensionDateString();
virtual void OnCoreMapStart(edict_t *pEdictList, int edictCount, int clientMax);
void DatabaseConnect(); void DatabaseConnect();
bool AddQueryToQueue(TQueryOp *query); bool AddQueryToQueue(TQueryOp *query);

2
extensions/tf2/extension.cpp
View File

@ -451,6 +451,6 @@ TFClassType ClassnameToType(const char *classname)
/** /**
* A picture of a blue crab given to me as a gift and stored here for safe keeping * A picture of a blue crab given to me as a gift and stored here for safe keeping
* *
* http://www.democracycellproject.net/blog/archives/Clown%20car.jpg * http://sourcemod.net/Clown%20car.jpg
*/ */

2
plugins/include/float.inc
View File

@ -263,7 +263,7 @@ stock Float:operator--(Float:oper)
stock Float:operator-(Float:oper) stock Float:operator-(Float:oper)
{ {
return oper^Float:((-1)^((-1)/2)); /* IEEE values are sign/magnitude */ return oper^Float:cellmin; /* IEEE values are sign/magnitude */
} }
stock Float:operator*(Float:oper1, oper2) stock Float:operator*(Float:oper1, oper2)

5
plugins/include/tf2.inc
View File

@ -115,7 +115,10 @@ enum TFCond
TFCond_CritOnWin, TFCond_CritOnWin,
TFCond_CritOnFlagCapture, TFCond_CritOnFlagCapture,
TFCond_CritOnKill, TFCond_CritOnKill,
TFCond_RestrictToMelee TFCond_RestrictToMelee,
TFCond_CritMmmph = 44,
TFCond_DefenseBuffMmmph,
}; };
enum TFHoliday enum TFHoliday