games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-20 20:23:03 +02:00
Code Issues Releases Activity

Merge pull request #2865 from IvanSavenko/market_ownership_check_fix

Browse Source 
Cleaned up and fixed ownership checks for market netpack
This commit is contained in:
Ivan Savenko 2023-09-19 23:43:33 +03:00 committed by GitHub
commit 7b37c2353a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 70 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/windows/CCastleInterface.cpp
View File

@ -698,7 +698,11 @@ void CCastleBuildings::buildingClicked(BuildingID building, BuildingSubID::EBuil
break; break;
case BuildingID::MARKETPLACE: case BuildingID::MARKETPLACE:
GH.windows().createAndPushWindow<CMarketplaceWindow>(town, town->visitingHero); // can't use allied marketplace
if (town->getOwner() == LOCPLINT->playerID)
GH.windows().createAndPushWindow<CMarketplaceWindow>(town, town->visitingHero);
else
enterBuilding(building);
break; break;
case BuildingID::BLACKSMITH: case BuildingID::BLACKSMITH:

20
client/windows/CTradeWindow.cpp
View File

@ -872,7 +872,25 @@ void CMarketplaceWindow::selectionChanged(bool side)
bool CMarketplaceWindow::printButtonFor(EMarketMode M) const bool CMarketplaceWindow::printButtonFor(EMarketMode M) const
{ {
return market->allowsTrade(M) && M != mode && (hero || ( M != EMarketMode::CREATURE_RESOURCE && M != EMarketMode::RESOURCE_ARTIFACT && M != EMarketMode::ARTIFACT_RESOURCE )); if (!market->allowsTrade(M))
return false;
if (M == mode)
return false;
if ( M == EMarketMode::RESOURCE_RESOURCE || M == EMarketMode::RESOURCE_PLAYER)
{
auto * town = dynamic_cast<const CGTownInstance *>(market);
if (town)
return town->getOwner() == LOCPLINT->playerID;
else
return true;
}
else
{
return hero != nullptr;
}
} }
void CMarketplaceWindow::garrisonChanged() void CMarketplaceWindow::garrisonChanged()

73
server/NetPacksServer.cpp
View File

@ -155,35 +155,54 @@ void ApplyGhNetPackVisitor::visitBuyArtifact(BuyArtifact & pack)
void ApplyGhNetPackVisitor::visitTradeOnMarketplace(TradeOnMarketplace & pack) void ApplyGhNetPackVisitor::visitTradeOnMarketplace(TradeOnMarketplace & pack)
{ {
const CGObjectInstance * object = gh.getObj(pack.marketId);
const CGHeroInstance * hero = gh.getHero(pack.heroId);
const IMarket * market = IMarket::castFrom(object);
gh.throwIfWrongPlayer(&pack); gh.throwIfWrongPlayer(&pack);
const CGObjectInstance * market = gh.getObj(pack.marketId); if(!object)
if(!market)
gh.throwAndComplain(&pack, "Invalid market object"); gh.throwAndComplain(&pack, "Invalid market object");
const CGHeroInstance * hero = gh.getHero(pack.heroId);
//market must be owned or visited if(!market)
const IMarket * m = IMarket::castFrom(market);
if(!m)
gh.throwAndComplain(&pack, "market is not-a-market! :/"); gh.throwAndComplain(&pack, "market is not-a-market! :/");
PlayerColor player = market->tempOwner; bool heroCanBeInvalid = false;
if(!player.isValidPlayer()) if (pack.mode == EMarketMode::RESOURCE_RESOURCE || pack.mode == EMarketMode::RESOURCE_PLAYER)
player = gh.getTile(market->visitablePos())->visitableObjects.back()->tempOwner; {
// For resource exchange we must use our own market or visit neutral market
if (object->getOwner().isValidPlayer())
{
gh.throwIfWrongOwner(&pack, pack.marketId);
heroCanBeInvalid = true;
}
}
if(!player.isValidPlayer()) if (pack.mode == EMarketMode::CREATURE_UNDEAD)
gh.throwAndComplain(&pack, "No player can use this market!"); {
// For skeleton transformer, if hero is null then object must be owned
if (!hero)
{
gh.throwIfWrongOwner(&pack, pack.marketId);
heroCanBeInvalid = true;
}
}
bool allyTownSkillTrade = (pack.mode == EMarketMode::RESOURCE_SKILL && gh.getPlayerRelations(player, hero->tempOwner) == PlayerRelations::ALLIES); if (!heroCanBeInvalid)
{
gh.throwIfWrongOwner(&pack, pack.heroId);
if(hero && (!(player == hero->tempOwner || allyTownSkillTrade) if (!hero)
|| hero->visitablePos() != market->visitablePos())) gh.throwAndComplain(&pack, "Can not trade - no hero!");
gh.throwAndComplain(&pack, "This hero can't use this marketplace!");
if(!allyTownSkillTrade) // TODO: check that object is actually being visited (e.g. Query exists)
gh.throwIfWrongPlayer(&pack, player); if (!object->visitableAt(hero->visitablePos().x, hero->visitablePos().y))
gh.throwAndComplain(&pack, "Can not trade - object not visited!");
if (object->getOwner().isValidPlayer() && gh.getPlayerRelations(object->getOwner(), hero->getOwner()) == PlayerRelations::ENEMIES)
gh.throwAndComplain(&pack, "Can not trade - market not owned!");
}
result = true; result = true;
@ -191,43 +210,43 @@ void ApplyGhNetPackVisitor::visitTradeOnMarketplace(TradeOnMarketplace & pack)
{ {
case EMarketMode::RESOURCE_RESOURCE: case EMarketMode::RESOURCE_RESOURCE:
for(int i = 0; i < pack.r1.size(); ++i) for(int i = 0; i < pack.r1.size(); ++i)
result &= gh.tradeResources(m, pack.val[i], player, pack.r1[i], pack.r2[i]); result &= gh.tradeResources(market, pack.val[i], pack.player, pack.r1[i], pack.r2[i]);
break; break;
case EMarketMode::RESOURCE_PLAYER: case EMarketMode::RESOURCE_PLAYER:
for(int i = 0; i < pack.r1.size(); ++i) for(int i = 0; i < pack.r1.size(); ++i)
result &= gh.sendResources(pack.val[i], player, GameResID(pack.r1[i]), PlayerColor(pack.r2[i])); result &= gh.sendResources(pack.val[i], pack.player, GameResID(pack.r1[i]), PlayerColor(pack.r2[i]));
break; break;
case EMarketMode::CREATURE_RESOURCE: case EMarketMode::CREATURE_RESOURCE:
for(int i = 0; i < pack.r1.size(); ++i) for(int i = 0; i < pack.r1.size(); ++i)
result &= gh.sellCreatures(pack.val[i], m, hero, SlotID(pack.r1[i]), GameResID(pack.r2[i])); result &= gh.sellCreatures(pack.val[i], market, hero, SlotID(pack.r1[i]), GameResID(pack.r2[i]));
break; break;
case EMarketMode::RESOURCE_ARTIFACT: case EMarketMode::RESOURCE_ARTIFACT:
for(int i = 0; i < pack.r1.size(); ++i) for(int i = 0; i < pack.r1.size(); ++i)
result &= gh.buyArtifact(m, hero, GameResID(pack.r1[i]), ArtifactID(pack.r2[i])); result &= gh.buyArtifact(market, hero, GameResID(pack.r1[i]), ArtifactID(pack.r2[i]));
break; break;
case EMarketMode::ARTIFACT_RESOURCE: case EMarketMode::ARTIFACT_RESOURCE:
for(int i = 0; i < pack.r1.size(); ++i) for(int i = 0; i < pack.r1.size(); ++i)
result &= gh.sellArtifact(m, hero, ArtifactInstanceID(pack.r1[i]), GameResID(pack.r2[i])); result &= gh.sellArtifact(market, hero, ArtifactInstanceID(pack.r1[i]), GameResID(pack.r2[i]));
break; break;
case EMarketMode::CREATURE_UNDEAD: case EMarketMode::CREATURE_UNDEAD:
for(int i = 0; i < pack.r1.size(); ++i) for(int i = 0; i < pack.r1.size(); ++i)
result &= gh.transformInUndead(m, hero, SlotID(pack.r1[i])); result &= gh.transformInUndead(market, hero, SlotID(pack.r1[i]));
break; break;
case EMarketMode::RESOURCE_SKILL: case EMarketMode::RESOURCE_SKILL:
for(int i = 0; i < pack.r2.size(); ++i) for(int i = 0; i < pack.r2.size(); ++i)
result &= gh.buySecSkill(m, hero, SecondarySkill(pack.r2[i])); result &= gh.buySecSkill(market, hero, SecondarySkill(pack.r2[i]));
break; break;
case EMarketMode::CREATURE_EXP: case EMarketMode::CREATURE_EXP:
{ {
std::vector<SlotID> slotIDs(pack.r1.begin(), pack.r1.end()); std::vector<SlotID> slotIDs(pack.r1.begin(), pack.r1.end());
std::vector<ui32> count(pack.val.begin(), pack.val.end()); std::vector<ui32> count(pack.val.begin(), pack.val.end());
result = gh.sacrificeCreatures(m, hero, slotIDs, count); result = gh.sacrificeCreatures(market, hero, slotIDs, count);
return; return;
} }
case EMarketMode::ARTIFACT_EXP: case EMarketMode::ARTIFACT_EXP:
{ {
std::vector<ArtifactPosition> positions(pack.r1.begin(), pack.r1.end()); std::vector<ArtifactPosition> positions(pack.r1.begin(), pack.r1.end());
result = gh.sacrificeArtifact(m, hero, positions); result = gh.sacrificeArtifact(market, hero, positions);
return; return;
} }
default: default: