reHLDS/rehlds
2
0
Fork 0
mirror of https://github.com/rehlds/rehlds.git synced 2024-12-29 08:05:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #493 from WPMGPRoSToTeMa/patch-9

Browse Source 
Added BOM skipping for .cfg files
This commit is contained in:
theAsmodai 2017-07-11 15:07:38 +03:00 committed by GitHub
commit 49f657e3c4
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rehlds/engine/cmd.cpp
View File

@ -378,19 +378,28 @@ void Cmd_Exec_f(void)
pszFileData[nAddLen] = 0; pszFileData[nAddLen] = 0;
FS_Close(hFile); FS_Close(hFile);
char *configContents = pszFileData;
#ifdef REHLDS_FIXES
if (configContents[0] == char(0xEF) && configContents[1] == char(0xBB) && configContents[2] == char(0xBF))
{
configContents += 3;
nAddLen -= 3;
}
#endif
Con_DPrintf("execing %s\n", pszFileName); Con_DPrintf("execing %s\n", pszFileName);
if (cmd_text.cursize + nAddLen + 2 < cmd_text.maxsize) if (cmd_text.cursize + nAddLen + 2 < cmd_text.maxsize)
{ {
Cbuf_InsertTextLines(pszFileData); Cbuf_InsertTextLines(configContents);
} }
else else
{ {
char *pszDataPtr = pszFileData; char *pszDataPtr = configContents;
while (true) while (true)
{ {
Cbuf_Execute(); // TODO: This doesn't obey the rule to first execute commands from the file, and then the others in the buffer Cbuf_Execute(); // TODO: This doesn't obey the rule to first execute commands from the file, and then the others in the buffer
pszDataPtr = COM_ParseLine(pszDataPtr); pszDataPtr = COM_ParseLine(pszDataPtr); // TODO: COM_ParseLine can be const char*
if (com_token[0] == 0) if (com_token[0] == 0)
{ {