Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

clean up receiving map fragments

Browse source
This commit is contained in:
Tim Felgentreff 2022-01-15 20:25:56 +01:00
parent 9c93a45eab
commit 14bcd8f4cc
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.vscode/launch.json vendored
View file

@ -14,7 +14,7 @@
"windows": {
"type": "cppvsdbg",
"program": "${workspaceFolder}/build/Debug/stratagus-dbg.exe",
"args": ["-W", "-a", "-d", "${workspaceFolder}\\..\\data.${input:game}"],
"args": ["-W", "-p", "-a", "-d", "${workspaceFolder}\\..\\data.${input:game}"],
"environment": [
{"name": "PATH", "value": "${workspaceFolder}\\..\\dependencies\\bin;${env:PATH}"},
{"name": "OMP_WAIT_POLICY", "value": "passive"}

12
src/network/netconnect.cpp
View file

@ -857,26 +857,26 @@ void CClient::Parse_MapFragment(const unsigned char *buf)
// FIXME: what if the file exists before even the first fragment creates it?
fs::path mappath(StratagusLibPath);
char *path = new char[msg.PathSize];
// msg.PathSize is 8bits, so smaller than msg.Data by construction
memcpy(path, msg.Data, msg.PathSize);
const std::string mappath = StratagusLibPath + "/" + path;
mappath /= path;
delete[] path;
std::ofstream mapfile;
mapfile.open(mappath, std::ios::out | std::ios::app | std::ios::binary);
std::ofstream mapfile(mappath.c_str(), std::ios::out | std::ios::app | std::ios::binary);
if (!mapfile.is_open()) {
networkState.State = ccs_badmap;
fprintf(stderr, "Could not open %s for appending map data\n", mappath.c_str());
fprintf(stderr, "Could not open %s for appending map data\n", mappath.u8string().c_str());
return;
} else {
Assert(msg.DataSize + msg.PathSize < sizeof(msg.Data));
Assert(msg.DataSize + msg.PathSize <= sizeof(msg.Data));
mapfile.write(msg.Data + msg.PathSize, msg.DataSize);
mapfile.close();
}
networkState.State = ccs_needmap;
networkState.StateArg = msg.FragmentIndex++;
networkState.StateArg++;
networkState.MsgCnt = 0;
}