Skip to content

bugfix(network): Handle both map path separators #3108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bobtista wants to merge 1 commit into
base: main
Choose a base branch
from
+28 −41
Open

bugfix(network): Handle both map path separators #3108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Core/GameEngine/Include/GameNetwork/FileTransfer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ class GameInfo;
AsciiString GetBasePathFromPath( AsciiString path );
AsciiString GetBaseFileFromFile( AsciiString fname );
AsciiString GetPreviewFromMap( AsciiString path );
AsciiString GetINIFromMap( AsciiString path );
AsciiString GetStrFileFromMap( AsciiString path );
AsciiString GetSoloINIFromMap( AsciiString path );
AsciiString GetAssetUsageFromMap( AsciiString path );
AsciiString GetReadmeFromMap( AsciiString path );
AsciiString GetINIFromMap( const AsciiString &path );
AsciiString GetStrFileFromMap( const AsciiString &path );
AsciiString GetSoloINIFromMap( const AsciiString &path );
AsciiString GetAssetUsageFromMap( const AsciiString &path );
AsciiString GetReadmeFromMap( const AsciiString &path );

// The meat of file (map) transfers
Bool DoAnyMapTransfers(GameInfo *game);
59 changes: 23 additions & 36 deletions Core/GameEngine/Source/GameNetwork/FileTransfer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

#include "PreRTS.h" // This must go first in EVERY cpp file in the GameEngine

#include "Common/FileSystem.h"
#include "GameClient/LoadScreen.h"
#include "GameClient/Shell.h"
#include "GameNetwork/FileTransfer.h"
Expand Down Expand Up @@ -155,59 +156,45 @@ AsciiString GetBaseFileFromFile( AsciiString fname )
return AsciiString::TheEmptyString;
}

AsciiString GetPreviewFromMap( AsciiString path )
static AsciiString GetFileInMapDirectory( const AsciiString &mapPath, const AsciiString &filename )
{
AsciiString fname = GetBaseFileFromFile(getFileName(path.str()));
AsciiString base = GetBasePathFromPath(path);

AsciiString out;
out.format("%s\\%s.tga", base.str(), fname.str());
return out;
const char *file = getFileName(mapPath.str());
AsciiString path;
path.set(mapPath.str(), file - mapPath.str());
path.concat(filename);
return path;
}

AsciiString GetINIFromMap( AsciiString path )
AsciiString GetPreviewFromMap( AsciiString path )
{
AsciiString base = GetBasePathFromPath(path);

AsciiString out;
out.format("%s\\map.ini", base.str());
return out;
FileSystem::removeExtension(path);
path.concat(".tga");
return path;
}

AsciiString GetStrFileFromMap( AsciiString path )
AsciiString GetINIFromMap( const AsciiString &path )
{
AsciiString base = GetBasePathFromPath(path);

AsciiString out;
out.format("%s\\map.str", base.str());
return out;
return GetFileInMapDirectory(path, "map.ini");
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
}

AsciiString GetSoloINIFromMap( AsciiString path )
AsciiString GetStrFileFromMap( const AsciiString &path )
{
AsciiString base = GetBasePathFromPath(path);

AsciiString out;
out.format("%s\\solo.ini", base.str());
return out;
return GetFileInMapDirectory(path, "map.str");
}

AsciiString GetAssetUsageFromMap( AsciiString path )
AsciiString GetSoloINIFromMap( const AsciiString &path )
{
AsciiString base = GetBasePathFromPath(path);

AsciiString out;
out.format("%s\\assetusage.txt", base.str());
return out;
return GetFileInMapDirectory(path, "solo.ini");
}

AsciiString GetReadmeFromMap( AsciiString path )
AsciiString GetAssetUsageFromMap( const AsciiString &path )
{
AsciiString base = GetBasePathFromPath(path);
return GetFileInMapDirectory(path, "assetusage.txt");
}

AsciiString out;
out.format("%s\\readme.txt", base.str());
return out;
AsciiString GetReadmeFromMap( const AsciiString &path )
{
return GetFileInMapDirectory(path, "readme.txt");
}

//-------------------------------------------------------------------------------------
Expand Down
Loading