games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-09 13:14:02 +02:00
Code Issues Releases Activity

Code review tweaks

Browse Source
This commit is contained in:
nordsoft 2022-10-08 19:52:29 +04:00
parent 64a801004c
commit 63b29cbaea
2 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
server/CGameHandler.cpp
View File

@ -1334,13 +1334,11 @@ void CGameHandler::handleClientDisconnection(std::shared_ptr<CConnection> c)
if(!playerSettings) if(!playerSettings)
continue; continue;
for(auto & playerConnection : playerConnections.second) auto playerConnection = vstd::find(playerConnections.second, c);
if(playerConnection != playerConnections.second.end())
{ {
if(playerConnection == c) std::string messageText = boost::str(boost::format("%s (cid %d) was disconnected") % playerSettings->name % c->connectionID);
{ playerMessage(playerId, messageText, ObjectInstanceID{});
std::string messageText = boost::str(boost::format("%s (cid %d) was disconnected") % playerSettings->name % c->connectionID);
playerMessage(playerId, messageText, ObjectInstanceID{});
}
} }
} }
} }
@ -5012,33 +5010,33 @@ void CGameHandler::playerMessage(PlayerColor player, const std::string &message,
PlayerMessageClient temp_message(player, message); PlayerMessageClient temp_message(player, message);
sendAndApply(&temp_message); sendAndApply(&temp_message);
std::vector<std::string> cheat; std::vector<std::string> words;
boost::split(cheat, message, boost::is_any_of(" ")); boost::split(words, message, boost::is_any_of(" "));
bool isHost = false; bool isHost = false;
for(auto & c : connections[player]) for(auto & c : connections[player])
if(lobby->isClientHost(c->connectionID)) if(lobby->isClientHost(c->connectionID))
isHost = true; isHost = true;
if(isHost && cheat.size() >= 2 && cheat[0] == "game") if(isHost && words.size() >= 2 && words[0] == "game")
{ {
if(cheat[1] == "exit" || cheat[1] == "quit" || cheat[1] == "end") if(words[1] == "exit" || words[1] == "quit" || words[1] == "end")
{ {
SystemMessage temp_message("game was terminated"); SystemMessage temp_message("game was terminated");
sendAndApply(&temp_message); sendAndApply(&temp_message);
lobby->state = EServerState::SHUTDOWN; lobby->state = EServerState::SHUTDOWN;
return; return;
} }
if(cheat.size() == 3 && cheat[1] == "save") if(words.size() == 3 && words[1] == "save")
{ {
save("Saves/" + cheat[2]); save("Saves/" + words[2]);
SystemMessage temp_message("game saved as " + cheat[2]); SystemMessage temp_message("game saved as " + words[2]);
sendAndApply(&temp_message); sendAndApply(&temp_message);
return; return;
} }
if(cheat.size() == 3 && cheat[1] == "kick") if(words.size() == 3 && words[1] == "kick")
{ {
auto playername = cheat[2]; auto playername = words[2];
PlayerColor playerToKick(PlayerColor::CANNOT_DETERMINE); PlayerColor playerToKick(PlayerColor::CANNOT_DETERMINE);
if(std::all_of(playername.begin(), playername.end(), ::isdigit)) if(std::all_of(playername.begin(), playername.end(), ::isdigit))
playerToKick = PlayerColor(std::stoi(playername)); playerToKick = PlayerColor(std::stoi(playername));
@ -5064,9 +5062,9 @@ void CGameHandler::playerMessage(PlayerColor player, const std::string &message,
} }
int obj = 0; int obj = 0;
if (cheat.size() == 2) if (words.size() == 2)
{ {
obj = std::atoi(cheat[1].c_str()); obj = std::atoi(words[1].c_str());
if (obj) if (obj)
currObj = ObjectInstanceID(obj); currObj = ObjectInstanceID(obj);
} }
@ -5076,38 +5074,38 @@ void CGameHandler::playerMessage(PlayerColor player, const std::string &message,
if (!town && hero) if (!town && hero)
town = hero->visitedTown; town = hero->visitedTown;
if (cheat.size() == 1 || obj) if (words.size() == 1 || obj)
handleCheatCode(cheat[0], player, hero, town, cheated); handleCheatCode(words[0], player, hero, town, cheated);
else else
{ {
for (const auto & i : gs->players) for (const auto & i : gs->players)
{ {
if (i.first == PlayerColor::NEUTRAL) if (i.first == PlayerColor::NEUTRAL)
continue; continue;
if (cheat[1] == "ai") if (words[1] == "ai")
{ {
if (i.second.human) if (i.second.human)
continue; continue;
} }
else if (cheat[1] != "all" && cheat[1] != i.first.getStr()) else if (words[1] != "all" && words[1] != i.first.getStr())
continue; continue;
if (cheat[0] == "vcmiformenos" || cheat[0] == "vcmieagles" || cheat[0] == "vcmiungoliant") if (words[0] == "vcmiformenos" || words[0] == "vcmieagles" || words[0] == "vcmiungoliant")
{ {
handleCheatCode(cheat[0], i.first, nullptr, nullptr, cheated); handleCheatCode(words[0], i.first, nullptr, nullptr, cheated);
} }
else if (cheat[0] == "vcmiarmenelos") else if (words[0] == "vcmiarmenelos")
{ {
for (const auto & t : i.second.towns) for (const auto & t : i.second.towns)
{ {
handleCheatCode(cheat[0], i.first, nullptr, t, cheated); handleCheatCode(words[0], i.first, nullptr, t, cheated);
} }
} }
else else
{ {
for (const auto & h : i.second.heroes) for (const auto & h : i.second.heroes)
{ {
handleCheatCode(cheat[0], i.first, h, nullptr, cheated); handleCheatCode(words[0], i.first, h, nullptr, cheated);
} }
} }
} }

32
server/CVCMIServer.cpp
View File

@ -466,24 +466,26 @@ void CVCMIServer::clientConnected(std::shared_ptr<CConnection> c, std::vector<st
logNetwork->info("Connection with client %d established. UUID: %s", c->connectionID, c->uuid); logNetwork->info("Connection with client %d established. UUID: %s", c->connectionID, c->uuid);
if(state == EServerState::LOBBY) if(state == EServerState::LOBBY)
for(auto & name : names)
{ {
logNetwork->info("Client %d player: %s", c->connectionID, name); for(auto & name : names)
ui8 id = currentPlayerId++;
ClientPlayer cp;
cp.connection = c->connectionID;
cp.name = name;
playerNames.insert(std::make_pair(id, cp));
announceTxt(boost::str(boost::format("%s (pid %d cid %d) joins the game") % name % id % c->connectionID));
//put new player in first slot with AI
for(auto & elem : si->playerInfos)
{ {
if(elem.second.isControlledByAI() && !elem.second.compOnly) logNetwork->info("Client %d player: %s", c->connectionID, name);
ui8 id = currentPlayerId++;
ClientPlayer cp;
cp.connection = c->connectionID;
cp.name = name;
playerNames.insert(std::make_pair(id, cp));
announceTxt(boost::str(boost::format("%s (pid %d cid %d) joins the game") % name % id % c->connectionID));
//put new player in first slot with AI
for(auto & elem : si->playerInfos)
{ {
setPlayerConnectedId(elem.second, id); if(elem.second.isControlledByAI() && !elem.second.compOnly)
break; {
setPlayerConnectedId(elem.second, id);
break;
}
} }
} }
} }