games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

code review + fixes

Browse Source
This commit is contained in:
Laserlicht
2025-11-05 20:35:38 +01:00
parent 8b653ea3fb
commit 5718416ebf
3 changed files with 22 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
client/lobby/BattleOnlyMode.cpp
View File

@@ -95,6 +95,9 @@ BattleOnlyModeWindow::BattleOnlyModeWindow()
auto & terrains = LIBRARY->terrainTypeHandler->objects; auto & terrains = LIBRARY->terrainTypeHandler->objects;
for (const auto & terrain : terrains) for (const auto & terrain : terrains)
{ {
if(!terrain->isPassable())
continue;
texts.push_back(terrain->getNameTranslated()); texts.push_back(terrain->getNameTranslated());
const auto & patterns = LIBRARY->terviewh->getTerrainViewPatterns(terrain->getId()); const auto & patterns = LIBRARY->terviewh->getTerrainViewPatterns(terrain->getId());
@@ -142,12 +145,12 @@ BattleOnlyModeWindow::BattleOnlyModeWindow()
startInfo->selectedHero[0] = std::nullopt; startInfo->selectedHero[0] = std::nullopt;
startInfo->selectedArmy[0].fill(CStackBasicDescriptor(CreatureID::NONE, 1)); startInfo->selectedArmy[0].fill(CStackBasicDescriptor(CreatureID::NONE, 1));
for(size_t i=0; i<GameConstants::ARMY_SIZE; i++) for(size_t i=0; i<GameConstants::ARMY_SIZE; i++)
heroSelector1->selectedArmyInput.at(i)->setText("1"); heroSelector1->selectedArmyInput.at(i)->disable();
} }
startInfo->selectedHero[1] = std::nullopt; startInfo->selectedHero[1] = std::nullopt;
startInfo->selectedArmy[1].fill(CStackBasicDescriptor(CreatureID::NONE, 1)); startInfo->selectedArmy[1].fill(CStackBasicDescriptor(CreatureID::NONE, 1));
for(size_t i=0; i<GameConstants::ARMY_SIZE; i++) for(size_t i=0; i<GameConstants::ARMY_SIZE; i++)
heroSelector2->selectedArmyInput.at(i)->setText("1"); heroSelector2->selectedArmyInput.at(i)->disable();
onChange(); onChange();
}); });
buttonReset->setTextOverlay(LIBRARY->generaltexth->translate("vcmi.lobby.battleOnlyModeReset"), EFonts::FONT_SMALL, Colors::WHITE); buttonReset->setTextOverlay(LIBRARY->generaltexth->translate("vcmi.lobby.battleOnlyModeReset"), EFonts::FONT_SMALL, Colors::WHITE);
@@ -260,9 +263,10 @@ BattleOnlyModeHeroSelector::BattleOnlyModeHeroSelector(int id, BattleOnlyModeWin
{ {
parent.startInfo->selectedArmy[id][i].setCount(TextOperations::parseMetric<int>(text)); parent.startInfo->selectedArmy[id][i].setCount(TextOperations::parseMetric<int>(text));
parent.onChange(); parent.onChange();
selectedArmyInput[i]->enable();
} }
else else
selectedArmyInput[i]->setText("1"); selectedArmyInput[i]->disable();
}); });
} }
@@ -295,11 +299,11 @@ void BattleOnlyModeHeroSelector::setHeroIcon()
std::sort(heroes.begin(), heroes.end(), [](auto a, auto b) { std::sort(heroes.begin(), heroes.end(), [](auto a, auto b) {
auto heroA = a.toHeroType(); auto heroA = a.toHeroType();
auto heroB = b.toHeroType(); auto heroB = b.toHeroType();
if (heroA->heroClass->getId() == heroB->heroClass->getId()) if(heroA->heroClass->faction != heroB->heroClass->faction)
return heroA->getNameTranslated() < heroB->getNameTranslated();
if (heroA->heroClass->faction == heroB->heroClass->faction)
return heroA->heroClass->getId() < heroB->heroClass->getId();
return heroA->heroClass->faction < heroB->heroClass->faction; return heroA->heroClass->faction < heroB->heroClass->faction;
if(heroA->heroClass->getId() != heroB->heroClass->getId())
return heroA->heroClass->getId() < heroB->heroClass->getId();
return heroA->getNameTranslated() < heroB->getNameTranslated();
}); });
int selectedIndex = !parent.startInfo->selectedHero[id] ? 0 : (1 + std::distance(heroes.begin(), std::find_if(heroes.begin(), heroes.end(), [this](auto heroID) { int selectedIndex = !parent.startInfo->selectedHero[id] ? 0 : (1 + std::distance(heroes.begin(), std::find_if(heroes.begin(), heroes.end(), [this](auto heroID) {
@@ -319,7 +323,7 @@ void BattleOnlyModeHeroSelector::setHeroIcon()
image->scaleTo(Point(35, 23), EScalingAlgorithm::NEAREST); image->scaleTo(Point(35, 23), EScalingAlgorithm::NEAREST);
images.push_back(image); images.push_back(image);
} }
auto window = std::make_shared<CObjectListWindow>(texts, nullptr, LIBRARY->generaltexth->translate("object.core.hero.name"), LIBRARY->generaltexth->translate("vcmi.lobby.battleOnlyModeHeroSelect"), [this, heroes](int index){ auto window = std::make_shared<CObjectListWindow>(texts, nullptr, LIBRARY->generaltexth->translate("vcmi.lobby.battleOnlyModeHeroSelect"), LIBRARY->generaltexth->translate("vcmi.lobby.battleOnlyModeHeroSelect"), [this, heroes](int index){
if(index == 0) if(index == 0)
{ {
parent.startInfo->selectedHero[id] = std::nullopt; parent.startInfo->selectedHero[id] = std::nullopt;
@@ -361,7 +365,7 @@ void BattleOnlyModeHeroSelector::setCreatureIcons()
if(parent.startInfo->selectedArmy[id][i].getId() == CreatureID::NONE) if(parent.startInfo->selectedArmy[id][i].getId() == CreatureID::NONE)
{ {
creatureImage[i] = std::make_shared<CPicture>(drawBlackBox(Point(32, 32), LIBRARY->generaltexth->translate("vcmi.lobby.battleOnlyModeSelect"), id == 1 ? Colors::WHITE : parent.disabledColor), Point(6 + i * 36, 78)); creatureImage[i] = std::make_shared<CPicture>(drawBlackBox(Point(32, 32), LIBRARY->generaltexth->translate("vcmi.lobby.battleOnlyModeSelect"), id == 1 ? Colors::WHITE : parent.disabledColor), Point(6 + i * 36, 78));
selectedArmyInput[i]->setText("1"); selectedArmyInput[i]->disable();
} }
else else
{ {
@@ -369,6 +373,7 @@ void BattleOnlyModeHeroSelector::setCreatureIcons()
auto creatureID = unit.getId(); auto creatureID = unit.getId();
creatureImage[i] = std::make_shared<CPicture>(ENGINE->renderHandler().loadAnimation(AnimationPath::builtin("CPRSMALL"), EImageBlitMode::COLORKEY)->getImage(LIBRARY->creh->objects.at(creatureID)->getIconIndex()), Point(6 + i * 36, 78)); creatureImage[i] = std::make_shared<CPicture>(ENGINE->renderHandler().loadAnimation(AnimationPath::builtin("CPRSMALL"), EImageBlitMode::COLORKEY)->getImage(LIBRARY->creh->objects.at(creatureID)->getIconIndex()), Point(6 + i * 36, 78));
selectedArmyInput[i]->setText(TextOperations::formatMetric(unit.getCount(), 3)); selectedArmyInput[i]->setText(TextOperations::formatMetric(unit.getCount(), 3));
selectedArmyInput[i]->enable();
} }
creatureImage[i]->addLClickCallback([this, i](){ creatureImage[i]->addLClickCallback([this, i](){
@@ -377,11 +382,13 @@ void BattleOnlyModeHeroSelector::setCreatureIcons()
std::sort(creatures.begin(), creatures.end(), [](auto a, auto b) { std::sort(creatures.begin(), creatures.end(), [](auto a, auto b) {
auto creatureA = a.toCreature(); auto creatureA = a.toCreature();
auto creatureB = b.toCreature(); auto creatureB = b.toCreature();
if (creatureA->getLevel() == creatureB->getLevel()) if(creatureA->getFactionID() != creatureB->getFactionID())
return creatureA->getNameSingularTranslated() < creatureB->getNameSingularTranslated();
if (creatureA->getFactionID() == creatureB->getFactionID())
return creatureA->getLevel() < creatureB->getLevel();
return creatureA->getFactionID() < creatureB->getFactionID(); return creatureA->getFactionID() < creatureB->getFactionID();
if(creatureA->getLevel() != creatureB->getLevel())
return creatureA->getLevel() < creatureB->getLevel();
if(creatureA->upgrades.size() != creatureB->upgrades.size())
return creatureA->upgrades.size() > creatureB->upgrades.size();
return creatureA->getNameSingularTranslated() < creatureB->getNameSingularTranslated();
}); });
int selectedIndex = parent.startInfo->selectedArmy[id][i].getId() == CreatureID::NONE ? 0 : (1 + std::distance(creatures.begin(), std::find_if(creatures.begin(), creatures.end(), [this, i](auto creatureID) { int selectedIndex = parent.startInfo->selectedArmy[id][i].getId() == CreatureID::NONE ? 0 : (1 + std::distance(creatures.begin(), std::find_if(creatures.begin(), creatures.end(), [this, i](auto creatureID) {
@@ -401,10 +408,9 @@ void BattleOnlyModeHeroSelector::setCreatureIcons()
image->scaleTo(Point(23, 23), EScalingAlgorithm::NEAREST); image->scaleTo(Point(23, 23), EScalingAlgorithm::NEAREST);
images.push_back(image); images.push_back(image);
} }
auto window = std::make_shared<CObjectListWindow>(texts, nullptr, LIBRARY->generaltexth->translate("core.genrltxt.42"), LIBRARY->generaltexth->translate("vcmi.lobby.battleOnlyModeCreatureSelect"), [this, creatures, i](int index){ auto window = std::make_shared<CObjectListWindow>(texts, nullptr, LIBRARY->generaltexth->translate("vcmi.lobby.battleOnlyModeCreatureSelect"), LIBRARY->generaltexth->translate("vcmi.lobby.battleOnlyModeCreatureSelect"), [this, creatures, i](int index){
if(index == 0) if(index == 0)
{ {
if(parent.startInfo->selectedArmy[id][i].getId() == CreatureID::NONE)
parent.startInfo->selectedArmy[id][i] = CStackBasicDescriptor(CreatureID::NONE, 1); parent.startInfo->selectedArmy[id][i] = CStackBasicDescriptor(CreatureID::NONE, 1);
parent.onChange(); parent.onChange();
return; return;

22
lib/mapObjects/CGHeroInstance.cpp
View File

@@ -1345,28 +1345,6 @@ void CGHeroInstance::restoreBonusSystem(CGameState & gs)
} }
} }
void CGHeroInstance::attachToBonusSystem(CGameState & gs)
{
CArmedInstance::attachToBonusSystem(gs);
if (boardedBoat.hasValue())
{
auto boat = gs.getObjInstance(boardedBoat);
if (boat)
attachTo(dynamic_cast<CGBoat&>(*boat));
}
}
void CGHeroInstance::detachFromBonusSystem(CGameState & gs)
{
CArmedInstance::detachFromBonusSystem(gs);
if (boardedBoat.hasValue())
{
auto boat = gs.getObjInstance(boardedBoat);
if (boat)
detachFrom(dynamic_cast<CGBoat&>(*boat));
}
}
CBonusSystemNode & CGHeroInstance::whereShouldBeAttached(CGameState & gs) CBonusSystemNode & CGHeroInstance::whereShouldBeAttached(CGameState & gs)
{ {
if(visitedTown.hasValue()) if(visitedTown.hasValue())

2
lib/mapObjects/CGHeroInstance.h
View File

@@ -311,8 +311,6 @@ public:
void afterAddToMap(CMap * map) override; void afterAddToMap(CMap * map) override;
void afterRemoveFromMap(CMap * map) override; void afterRemoveFromMap(CMap * map) override;
void attachToBonusSystem(CGameState & gs) override;
void detachFromBonusSystem(CGameState & gs) override;
void restoreBonusSystem(CGameState & gs) override; void restoreBonusSystem(CGameState & gs) override;
void updateFrom(const JsonNode & data) override; void updateFrom(const JsonNode & data) override;