games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-21 00:19:29 +02:00
Code Issues Releases Activity

Merge branch 'vcmi:develop' into cheats

Browse Source
This commit is contained in:
Laserlicht
2025-05-23 20:38:11 +02:00
committed by GitHub
parent 9f937e9791 7b3d690998
commit 043075a719
99 changed files with 2287 additions and 1647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/processors/PlayerMessageProcessor.cpp
View File

@ -50,7 +50,7 @@ void PlayerMessageProcessor::playerMessage(PlayerColor player, const std::string
if(handleCheatCode(message, player, currObj))
{
if(!gameHandler->getPlayerSettings(player)->isControlledByAI())
if(!gameHandler->gameInfo().getPlayerSettings(player)->isControlledByAI())
{
MetaString txt;
txt.appendLocalString(EMetaText::GENERAL_TXT, 260);
@ -149,7 +149,7 @@ void PlayerMessageProcessor::commandStatistic(PlayerColor player, const std::vec
if(!isHost)
return;
std::string path = gameHandler->gameState().statistic.writeCsv();
std::string path = gameHandler->statistics->writeCsv();
auto str = MetaString::createFromTextID("vcmi.broadcast.statisticFile");
str.replaceRawString(path);
@ -330,7 +330,7 @@ void PlayerMessageProcessor::startVoting(PlayerColor initiator, ECurrentChatVote
for(PlayerColor player(0); player < PlayerColor::PLAYER_LIMIT; ++player)
{
auto state = gameHandler->getPlayerState(player, false);
auto state = gameHandler->gameInfo().getPlayerState(player, false);
if(state && state->isHuman() && initiator != player)
awaitingPlayers.insert(player);
}
@ -699,7 +699,7 @@ bool PlayerMessageProcessor::handleCheatCode(const std::string & cheat, PlayerCo
std::vector<std::string> words;
boost::split(words, boost::trim_copy(cheat), boost::is_any_of("\t\r\n "));
if (words.empty() || !gameHandler->getStartInfo()->extraOptionsInfo.cheatsAllowed)
if (words.empty() || !gameHandler->gameInfo().getStartInfo()->extraOptionsInfo.cheatsAllowed)
return false;
//Make cheat name case-insensitive, but keep words/parameters (e.g. creature name) as it
@ -797,8 +797,8 @@ bool PlayerMessageProcessor::handleCheatCode(const std::string & cheat, PlayerCo
void PlayerMessageProcessor::executeCheatCode(const std::string & cheatName, PlayerColor player, ObjectInstanceID currObj, const std::vector<std::string> & words)
{
const CGHeroInstance * hero = gameHandler->getHero(currObj);
const CGTownInstance * town = gameHandler->getTown(currObj);
const CGHeroInstance * hero = gameHandler->gameInfo().getHero(currObj);
const CGTownInstance * town = gameHandler->gameInfo().getTown(currObj);
if (!town && hero)
town = hero->getVisitedTown();