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

Merge pull request #710 from diamante0018/develop

Browse Source
This commit is contained in:
Edo 2023-01-09 22:21:24 +00:00 committed by GitHub
commit b5d348527b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Components/Modules/MapRotation.cpp
View File

@ -54,7 +54,7 @@ namespace Components
}
else
{
throw ParseRotationError();
throw MapRotationParseError();
}
}
}
@ -148,7 +148,7 @@ namespace Components
if (Dvar::Var("party_enable").get<bool>() && Dvar::Var("party_host").get<bool>())
{
Logger::Print(Game::CON_CHANNEL_SERVER, "Not performing map rotation as we are hosting a party!\n");
Logger::Warning(Game::CON_CHANNEL_SERVER, "Not performing map rotation as we are hosting a party!\n");
return false;
}
@ -172,7 +172,7 @@ namespace Components
void MapRotation::ApplyGametype(const std::string& gametype)
{
assert(!gametype.empty());
Dvar::Var("g_gametype").set(gametype);
Game::Dvar_SetStringByName("g_gametype", gametype.data());
}
void MapRotation::RestartCurrentMap()
@ -193,24 +193,22 @@ namespace Components
assert(!rotation.empty());
// Continue to apply gametype until a map is found
auto foundMap = false;
std::size_t i = 0;
while (!foundMap && i < rotation.getEntriesSize())
while (i < rotation.getEntriesSize())
{
const auto& entry = rotation.getNextEntry();
if (entry.first == "map"s)
{
Logger::Debug("Loading new map: '{}'", entry.second);
Logger::Print("Loading new map: '{}'", entry.second);
ApplyMap(entry.second);
// Map was found so we exit the loop
foundMap = true;
break;
}
else if (entry.first == "gametype"s)
if (entry.first == "gametype"s)
{
Logger::Debug("Applying new gametype: '{}'", entry.second);
Logger::Print("Applying new gametype: '{}'", entry.second);
ApplyGametype(entry.second);
}

4
src/Components/Modules/MapRotation.hpp
View File

@ -12,9 +12,9 @@ namespace Components
bool unitTest() override;
private:
struct ParseRotationError : public std::exception
struct MapRotationParseError : public std::exception
{
const char* what() const noexcept override { return "Parse Rotation Error"; }
[[nodiscard]] const char* what() const noexcept override { return "Map Rotation Parse Error"; }
};
class RotationData