games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

code review

Browse Source
This commit is contained in:
Laserlicht
2024-11-15 18:38:44 +01:00
parent 0f94f35dcf
commit b23c69b9d6
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/lobby/SelectionTab.cpp
View File

@@ -348,14 +348,14 @@ void SelectionTab::clickReleased(const Point & cursorPosition)
if(!curItems[py]->isFolder) if(!curItems[py]->isFolder)
CInfoWindow::showYesNoDialog(CGI->generaltexth->translate("vcmi.lobby.deleteFile") + "\n\n" + curItems[py]->fullFileURI, std::vector<std::shared_ptr<CComponent>>(), [this, py](){ CInfoWindow::showYesNoDialog(CGI->generaltexth->translate("vcmi.lobby.deleteFile") + "\n\n" + curItems[py]->fullFileURI, std::vector<std::shared_ptr<CComponent>>(), [this, py](){
LobbyDelete ld; LobbyDelete ld;
ld.type = tabType == ESelectionScreen::newGame ? LobbyDelete::RANDOMMAP : LobbyDelete::SAVEGAME; ld.type = tabType == ESelectionScreen::newGame ? LobbyDelete::EType::RANDOMMAP : LobbyDelete::EType::SAVEGAME;
ld.name = curItems[py]->fileURI; ld.name = curItems[py]->fileURI;
CSH->sendLobbyPack(ld); CSH->sendLobbyPack(ld);
}, nullptr); }, nullptr);
else else
CInfoWindow::showYesNoDialog(CGI->generaltexth->translate("vcmi.lobby.deleteFolder") + "\n\n" + curFolder + curItems[py]->folderName, std::vector<std::shared_ptr<CComponent>>(), [this, py](){ CInfoWindow::showYesNoDialog(CGI->generaltexth->translate("vcmi.lobby.deleteFolder") + "\n\n" + curFolder + curItems[py]->folderName, std::vector<std::shared_ptr<CComponent>>(), [this, py](){
LobbyDelete ld; LobbyDelete ld;
ld.type = LobbyDelete::SAVEGAME_FOLDER; ld.type = LobbyDelete::EType::SAVEGAME_FOLDER;
ld.name = curFolder + curItems[py]->folderName; ld.name = curFolder + curItems[py]->folderName;
CSH->sendLobbyPack(ld); CSH->sendLobbyPack(ld);
}, nullptr); }, nullptr);
@@ -935,7 +935,7 @@ std::vector<ResourcePath> SelectionTab::parseSaves(const std::unordered_set<Reso
return unsupported; return unsupported;
} }
void SelectionTab::handleUnsupportedSavegames(const std::vector<ResourcePath> files) void SelectionTab::handleUnsupportedSavegames(const std::vector<ResourcePath> & files)
{ {
if(CSH->isHost() && files.size()) if(CSH->isHost() && files.size())
{ {
@@ -945,7 +945,7 @@ void SelectionTab::handleUnsupportedSavegames(const std::vector<ResourcePath> fi
for(auto & file : files) for(auto & file : files)
{ {
LobbyDelete ld; LobbyDelete ld;
ld.type = LobbyDelete::SAVEGAME; ld.type = LobbyDelete::EType::SAVEGAME;
ld.name = file.getName(); ld.name = file.getName();
CSH->sendLobbyPack(ld); CSH->sendLobbyPack(ld);
} }

2
client/lobby/SelectionTab.h
View File

@@ -133,5 +133,5 @@ private:
void parseCampaigns(const std::unordered_set<ResourcePath> & files); void parseCampaigns(const std::unordered_set<ResourcePath> & files);
std::unordered_set<ResourcePath> getFiles(std::string dirURI, EResType resType); std::unordered_set<ResourcePath> getFiles(std::string dirURI, EResType resType);
void handleUnsupportedSavegames(const std::vector<ResourcePath> files); void handleUnsupportedSavegames(const std::vector<ResourcePath> & files);
}; };

4
lib/networkPacks/PacksForLobby.h
View File

@@ -385,11 +385,11 @@ struct DLL_LINKAGE LobbyPvPAction : public CLobbyPackToServer
struct DLL_LINKAGE LobbyDelete : public CLobbyPackToServer struct DLL_LINKAGE LobbyDelete : public CLobbyPackToServer
{ {
enum EType : ui8 { enum class EType : ui8 {
SAVEGAME, SAVEGAME_FOLDER, RANDOMMAP SAVEGAME, SAVEGAME_FOLDER, RANDOMMAP
}; };
EType type = SAVEGAME; EType type = EType::SAVEGAME;
std::string name; std::string name;
void visitTyped(ICPackVisitor & visitor) override; void visitTyped(ICPackVisitor & visitor) override;

6
server/NetPacksLobbyServer.cpp
View File

@@ -442,15 +442,15 @@ void ClientPermissionsCheckerNetPackVisitor::visitLobbyDelete(LobbyDelete & pack
void ApplyOnServerNetPackVisitor::visitLobbyDelete(LobbyDelete & pack) void ApplyOnServerNetPackVisitor::visitLobbyDelete(LobbyDelete & pack)
{ {
if(pack.type == LobbyDelete::SAVEGAME || pack.type == LobbyDelete::RANDOMMAP) if(pack.type == LobbyDelete::EType::SAVEGAME || pack.type == LobbyDelete::EType::RANDOMMAP)
{ {
auto res = ResourcePath(pack.name, pack.type == LobbyDelete::SAVEGAME ? EResType::SAVEGAME : EResType::MAP); auto res = ResourcePath(pack.name, pack.type == LobbyDelete::EType::SAVEGAME ? EResType::SAVEGAME : EResType::MAP);
auto file = boost::filesystem::canonical(*CResourceHandler::get()->getResourceName(res)); auto file = boost::filesystem::canonical(*CResourceHandler::get()->getResourceName(res));
boost::filesystem::remove(file); boost::filesystem::remove(file);
if(boost::filesystem::is_empty(file.parent_path())) if(boost::filesystem::is_empty(file.parent_path()))
boost::filesystem::remove(file.parent_path()); boost::filesystem::remove(file.parent_path());
} }
else if(pack.type == LobbyDelete::SAVEGAME_FOLDER) else if(pack.type == LobbyDelete::EType::SAVEGAME_FOLDER)
{ {
auto res = ResourcePath("Saves/" + pack.name, EResType::DIRECTORY); auto res = ResourcePath("Saves/" + pack.name, EResType::DIRECTORY);
auto folder = boost::filesystem::canonical(*CResourceHandler::get()->getResourceName(res)); auto folder = boost::filesystem::canonical(*CResourceHandler::get()->getResourceName(res));