Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

65535 is the char limit for SL strings, conditionally add "scriptdata"

Browse Source
This commit is contained in:
ineed bots 2023-12-05 16:32:37 -06:00
parent 1c0f2daa13
commit 81bf44639f
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Components/Modules/GSC/IO.cpp
View File

@ -30,12 +30,20 @@ namespace Components::GSC
std::filesystem::path IO::BuildPath(const char* path) std::filesystem::path IO::BuildPath(const char* path)
{ {
const std::filesystem::path fsGame = (*Game::fs_gameDirVar)->current.string; const std::filesystem::path fsGame = (*Game::fs_gameDirVar)->current.string;
if (!fsGame.empty())
// check if we need to append scriptdata folder, for backwards compat
std::string spath = path;
if (!spath.starts_with("scriptdata/") && !spath.starts_with("scriptdata\\"))
{ {
return fsGame / "scriptdata"s / path; spath = "scriptdata/" + spath;
} }
return DefaultDestPath / "scriptdata"s / path; if (!fsGame.empty())
{
return fsGame / spath;
}
return DefaultDestPath / spath;
} }
void IO::GScr_OpenFile() void IO::GScr_OpenFile()
@ -85,7 +93,7 @@ namespace Components::GSC
return; return;
} }
char line[1024]{}; char line[65536]{};
if (std::fgets(line, sizeof(line), openScriptIOFileHandle) != nullptr) if (std::fgets(line, sizeof(line), openScriptIOFileHandle) != nullptr)
{ {
Game::Scr_AddString(line); Game::Scr_AddString(line);
@ -154,7 +162,7 @@ namespace Components::GSC
return; return;
} }
file = file.substr(0, 1024 - 1); // 1024 is the max string size for the SL system file = file.substr(0, (1 << 16) - 1); // 65535 is the max string size for the SL system
Game::Scr_AddString(file.data()); Game::Scr_AddString(file.data());
}); });