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

Merge pull request #328 from diamante0018/current-map-rotation

Browse Source 
[MapRotation] Some backwards compatibility
This commit is contained in:
Dss0 2022-06-25 00:58:09 +02:00 committed by GitHub
commit d08717f418
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 80 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -19,6 +19,7 @@ The format is based on [Keep a Changelog v0.3.0](http://keepachangelog.com/en/0.
### Changed
- `openLink` command was removed for security reasons (#286)
- `sv_mapRotationCurrent` is not being used anymore (#302)
### Fixed

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

@ -6,6 +6,7 @@ namespace Components
Dvar::Var MapRotation::SVDontRotate;
Game::dvar_t** MapRotation::SVMapRotation = reinterpret_cast<Game::dvar_t**>(0x62C7C44);
Game::dvar_t** MapRotation::SVMapRotationCurrent = reinterpret_cast<Game::dvar_t**>(0x2098DF0);
Game::dvar_t** MapRotation::SVMapname = reinterpret_cast<Game::dvar_t**>(0x2098DDC);
MapRotation::RotationData MapRotation::DedicatedRotation;
@ -98,18 +99,18 @@ namespace Components
return;
}
loaded = true;
try
{
DedicatedRotation.parse(data);
}
catch (const std::exception& ex)
{
Logger::Print(Game::CON_CHANNEL_SERVER, "{}: sv_mapRotation contains invalid data!\n", ex.what());
Logger::PrintError(Game::CON_CHANNEL_ERROR, "{}: {} contains invalid data!\n", ex.what(), (*SVMapRotation)->name);
}
Logger::Debug("DedicatedRotation size after parsing is '{}'", DedicatedRotation.getEntriesSize());
loaded = true;
}
void MapRotation::AddMapRotationCommands()
@ -155,6 +156,26 @@ namespace Components
return true;
}
void MapRotation::ApplyMap(const std::string& map)
{
assert(!map.empty());
if (Dvar::Var("sv_cheats").get<bool>())
{
Command::Execute(Utils::String::VA("devmap %s", map.data()), true);
}
else
{
Command::Execute(Utils::String::VA("map %s", map.data()), true);
}
}
void MapRotation::ApplyGametype(const std::string& gametype)
{
assert(!gametype.empty());
Dvar::Var("g_gametype").set(gametype.data());
}
void MapRotation::RestartCurrentMap()
{
std::string svMapname = (*SVMapname)->current.string;
@ -165,30 +186,25 @@ namespace Components
svMapname = "mp_afghan";
}
if (!Dvar::Var("sv_cheats").get<bool>())
{
Command::Execute(Utils::String::VA("map %s", svMapname.data()), true);
}
else
{
Command::Execute(Utils::String::VA("devmap %s", svMapname.data()), true);
}
ApplyMap(svMapname);
}
void MapRotation::ApplyMapRotation()
void MapRotation::ApplyRotation(RotationData& rotation)
{
assert(rotation.getEntriesSize() != 0);
// Continue to apply gametype until a map is found
auto foundMap = false;
std::size_t i = 0;
while (!foundMap && i < DedicatedRotation.getEntriesSize())
while (!foundMap && i < rotation.getEntriesSize())
{
const auto& entry = DedicatedRotation.getNextEntry();
const auto& entry = rotation.getNextEntry();
if (entry.first == "map")
{
Logger::Debug("Loading new map: '{}'", entry.second);
Command::Execute(Utils::String::VA("map %s", entry.second.data()), true);
ApplyMap(entry.second);
// Map was found so we exit the loop
foundMap = true;
@ -196,13 +212,43 @@ namespace Components
else if (entry.first == "gametype")
{
Logger::Debug("Applying new gametype: '{}'", entry.second);
Dvar::Var("g_gametype").set(entry.second);
ApplyGametype(entry.second);
}
++i;
}
}
void MapRotation::ApplyMapRotationCurrent(const std::string& data)
{
assert(!data.empty());
// Ook, ook, eek
Logger::Warning(Game::CON_CHANNEL_SERVER, "You are using deprecated {}", (*SVMapRotationCurrent)->name);
RotationData currentRotation;
try
{
Logger::Debug("Parsing {}", (*SVMapRotationCurrent)->name);
currentRotation.parse(data);
}
catch (const std::exception& ex)
{
Logger::PrintError(Game::CON_CHANNEL_ERROR, "{}: {} contains invalid data!\n", ex.what(), (*SVMapRotationCurrent)->name);
}
Game::Dvar_SetString(*SVMapRotationCurrent, "");
if (currentRotation.getEntriesSize() == 0)
{
Logger::Print(Game::CON_CHANNEL_SERVER, "{} is empty or contains invalid data. Restarting map\n", (*SVMapRotationCurrent)->name);
RestartCurrentMap();
return;
}
ApplyRotation(currentRotation);
}
void MapRotation::RandomizeMapRotation()
{
if (SVRandomMapRotation.get<bool>())
@ -224,8 +270,17 @@ namespace Components
}
Logger::Print(Game::CON_CHANNEL_SERVER, "Rotating map...\n");
const std::string mapRotation = (*SVMapRotation)->current.string;
// This takes priority because of backwards compatibility
const std::string mapRotationCurrent = (*SVMapRotationCurrent)->current.string;
if (!mapRotationCurrent.empty())
{
Logger::Debug("Applying {}", (*SVMapRotationCurrent)->name);
ApplyMapRotationCurrent(mapRotationCurrent);
return;
}
const std::string mapRotation = (*SVMapRotation)->current.string;
// People may have sv_mapRotation empty because they only use 'addMap' or 'addGametype'
if (!mapRotation.empty())
{
@ -235,14 +290,14 @@ namespace Components
if (DedicatedRotation.getEntriesSize() == 0)
{
Logger::Print(Game::CON_CHANNEL_SERVER, "sv_mapRotation is empty or contains invalid data. Restarting map\n");
Logger::Print(Game::CON_CHANNEL_SERVER, "{} is empty or contains invalid data. Restarting map\n", (*SVMapRotation)->name);
RestartCurrentMap();
return;
}
RandomizeMapRotation();
ApplyMapRotation();
ApplyRotation(DedicatedRotation);
}
MapRotation::MapRotation()

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

@ -47,6 +47,7 @@ namespace Components
static Dvar::Var SVDontRotate;
// Game Dvars
static Game::dvar_t** SVMapRotation;
static Game::dvar_t** SVMapRotationCurrent;
static Game::dvar_t** SVMapname;
// Holds the parsed data from sv_mapRotation
@ -58,8 +59,11 @@ namespace Components
static void AddMapRotationCommands();
static bool ShouldRotate();
static void ApplyMap(const std::string& map);
static void ApplyGametype(const std::string& gametype);
static void RestartCurrentMap();
static void ApplyMapRotation();
static void ApplyRotation(RotationData& rotation);
static void ApplyMapRotationCurrent(const std::string& data);
static void RandomizeMapRotation();
static void SV_MapRotate_f();