edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of http://github.com/heinrich5991/DDRace

Browse source
This commit is contained in:
GreYFoXGTi 2010-10-12 09:31:58 +02:00
parent 84ff10ca48 3b8815ade8
commit 74f9e46750
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/engine/shared/console.cpp
View file

@ -409,7 +409,7 @@ void CConsole::ExecuteFile(const char *pFilename,
RegisterAlternativePrintCallback(pfnAlternativePrintCallback, pUserData);
str_format(aBuf, sizeof(aBuf), "executing '%s'", pFilename);
Print(IConsole::OUTPUT_LEVEL_STANDARD, "console", aBuf);
PrintResponse(IConsole::OUTPUT_LEVEL_STANDARD, "console", aBuf);
lr.Init(File);
ReleaseAlternativePrintCallback();
@ -423,7 +423,7 @@ void CConsole::ExecuteFile(const char *pFilename,
RegisterAlternativePrintCallback(pfnAlternativePrintCallback, pUserData);
str_format(aBuf, sizeof(aBuf), "failed to open '%s'", pFilename);
Print(IConsole::OUTPUT_LEVEL_STANDARD, "console", aBuf);
PrintResponse(IConsole::OUTPUT_LEVEL_STANDARD, "console", aBuf);
ReleaseAlternativePrintCallback();
}
@ -438,12 +438,16 @@ void CConsole::Con_Echo(IResult *pResult, void *pUserData, int ClientId)
void CConsole::Con_Exec(IResult *pResult, void *pUserData, int ClientId)
{
((CConsole*)pUserData)->ExecuteFile(pResult->GetString(0));
CConsole *pSelf = (CConsole *)pUserData;
pSelf->ExecuteFile(pResult->GetString(0), pSelf->m_pfnAlternativePrintCallback, pSelf->m_pAlternativePrintCallbackUserdata,
pSelf->m_pfnAlternativePrintResponseCallback, pSelf->m_pAlternativePrintResponseCallbackUserdata);
}
struct CIntVariableData
{
IConsole *m_pConsole;
char *m_Name;
int *m_pVariable;
int m_Min;
int m_Max;
@ -452,6 +456,7 @@ struct CIntVariableData
struct CStrVariableData
{
IConsole *m_pConsole;
char *m_Name;
char *m_pStr;
int m_MaxSize;
};
@ -474,11 +479,15 @@ static void IntVariableCommand(IConsole::IResult *pResult, void *pUserData, int
}
*(pData->m_pVariable) = Val;
char aBuf[1024];
str_format(aBuf, sizeof(aBuf), "%s changed to %d", pData->m_Name, *(pData->m_pVariable));
pData->m_pConsole->PrintResponse(IConsole::OUTPUT_LEVEL_STANDARD, "Console", aBuf);
}
else
{
char aBuf[1024];
str_format(aBuf, sizeof(aBuf), "Value: %d", *(pData->m_pVariable));
str_format(aBuf, sizeof(aBuf), "%s is %d", pData->m_Name, *(pData->m_pVariable));
pData->m_pConsole->PrintResponse(IConsole::OUTPUT_LEVEL_STANDARD, "Console", aBuf);
}
}
@ -509,11 +518,15 @@ static void StrVariableCommand(IConsole::IResult *pResult, void *pUserData, int
}
else
str_copy(pData->m_pStr, pString, pData->m_MaxSize);
char aBuf[1024];
str_format(aBuf, sizeof(aBuf), "%s changed to '%s'", pData->m_Name, pData->m_pStr);
pData->m_pConsole->PrintResponse(IConsole::OUTPUT_LEVEL_STANDARD, "Console", aBuf);
}
else
{
char aBuf[1024];
str_format(aBuf, sizeof(aBuf), "Value: %s", pData->m_pStr);
str_format(aBuf, sizeof(aBuf), "%s is '%s'", pData->m_Name, pData->m_pStr);
pData->m_pConsole->PrintResponse(IConsole::OUTPUT_LEVEL_STANDARD, "Console", aBuf);
}
}
@ -549,13 +562,13 @@ CConsole::CConsole(int FlagMask)
// TODO: this should disappear
#define MACRO_CONFIG_INT(Name,ScriptName,Def,Min,Max,Flags,Desc,Level) \
{ \
static CIntVariableData Data = { this, &g_Config.m_##Name, Min, Max }; \
static CIntVariableData Data = { this, #ScriptName, &g_Config.m_##Name, Min, Max }; \
Register(#ScriptName, "?i", Flags, IntVariableCommand, &Data, Desc, Level); \
}
#define MACRO_CONFIG_STR(Name,ScriptName,Len,Def,Flags,Desc,Level) \
{ \
static CStrVariableData Data = { this, g_Config.m_##Name, Len }; \
static CStrVariableData Data = { this, #ScriptName, g_Config.m_##Name, Len }; \
Register(#ScriptName, "?r", Flags, StrVariableCommand, &Data, Desc, Level); \
}