Chestdialogfix #6
Conversation
…ming defeated opponent fade animation (ihhub#9000)
…ge and nearby towers demolition (Battlefield) (ihhub#9011)
Update battle_troop.cpp
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| @@ -241,7 +240,7 @@ bool World::LoadMapMP2( const std::string & filename, const bool isOriginalMp2Fi | |||
| for ( int32_t i = 0; i < worldSize; ++i ) { | |||
| Maps::Tiles & tile = vec_tiles[i]; | |||
|
|
|||
| MP2::mp2tile_t mp2tile; | |||
| MP2::MP2TileInfo mp2tile; | |||
There was a problem hiding this comment.
uninitialized record type: mp2tile
| MP2::MP2TileInfo mp2tile; | |
| MP2::MP2TileInfo mp2tile{}; |
| return false; | ||
| } | ||
|
|
||
| for ( const int32_t nearbyIdx : Battle::Board::GetAroundIndexes( pos ) ) { |
There was a problem hiding this comment.
replace loop by std::any_of()
| current.canAttackImmediately = Battle::Board::CanAttackTargetFromPosition( attacker, defender, posHeadIdx ); | ||
|
|
||
| // Pick target if either position has improved or unit is higher value at the same position value | ||
| if ( IsOutcomeImproved( current, bestOutcome ) ) { |
There was a problem hiding this comment.
1st argument current (passed to newOutcome) looks like it might be swapped with the 2nd, bestOutcome (passed to previous)
|
|
||
| actions.emplace_back( Battle::Command::SPELLCAST, bestSpell.spellID, bestSpell.cell ); | ||
|
|
||
| DEBUG_LOG( DBG_BATTLE, DBG_INFO, |
There was a problem hiding this comment.
inside a lambda, __FUNCTION__ expands to the name of the function call operator; consider capturing the name of the enclosing function explicitly
| continue; | ||
| } | ||
|
|
||
| const int32_t archerMeleeDmg = [¤tUnit, enemy]() { |
There was a problem hiding this comment.
narrowing conversion from uint32_t (aka unsigned int) to signed type int32_t (aka int) is implementation-defined
| return ( currentUnit.CalculateMinDamage( *enemy ) + currentUnit.CalculateMaxDamage( *enemy ) ) / 2; | ||
| }(); | ||
|
|
||
| const int32_t retaliatoryDmg = enemy->EstimateRetaliatoryDamage( archerMeleeDmg ); |
There was a problem hiding this comment.
narrowing conversion from uint32_t (aka unsigned int) to signed type int32_t (aka int) is implementation-defined
| target.cell = targetIdx; | ||
| target.unit = enemy; | ||
|
|
||
| DEBUG_LOG( DBG_BATTLE, DBG_TRACE, "- Set shooting attack priority on " << enemy->GetName() << ", value: " << priority ) |
There was a problem hiding this comment.
inside a lambda, __FUNCTION__ expands to the name of the function call operator; consider capturing the name of the enclosing function explicitly
| @@ -22,7 +22,7 @@ | |||
|
|
|||
| #define MAJOR_VERSION 1 | |||
| #define MINOR_VERSION 1 | |||
| #define INTERMEDIATE_VERSION 0 | |||
| #define INTERMEDIATE_VERSION 1 | |||
There was a problem hiding this comment.
macro INTERMEDIATE_VERSION defines an integral constant; prefer an enum instead
| @@ -22,7 +22,7 @@ | |||
|
|
|||
| #define MAJOR_VERSION 1 | |||
| #define MINOR_VERSION 1 | |||
| #define INTERMEDIATE_VERSION 0 | |||
| #define INTERMEDIATE_VERSION 1 | |||
There was a problem hiding this comment.
macro INTERMEDIATE_VERSION used to declare a constant; consider using a constexpr constant
| @@ -319,7 +315,7 @@ bool Maps::FileInfo::readMP2Map( std::string filePath, const bool isForEditor ) | |||
| // Each tile needs 16 + 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 + 16 + 32 + 32 = 160 bits or 20 bytes. | |||
| fs.seek( MP2::MP2_MAP_INFO_SIZE + ( lossConditionParams[0] + lossConditionParams[1] * width ) * 20 ); | |||
|
|
|||
| MP2::mp2tile_t mp2tile; | |||
| MP2::MP2TileInfo mp2tile; | |||
There was a problem hiding this comment.
uninitialized record type: mp2tile
| MP2::MP2TileInfo mp2tile; | |
| MP2::MP2TileInfo mp2tile{}; |
| break; | ||
| case DWELLING_MONSTER6: | ||
| offset.x = 314; | ||
| offset.y = 301; | ||
| icnIndex = DWELLING_UPGRADE7 & building ? 30 : ( DWELLING_UPGRADE6 & building ? 29 : 24 ); | ||
| icnIndex = DWELLING_UPGRADE7 & _constructedBuildings ? 30 : ( DWELLING_UPGRADE6 & _constructedBuildings ? 29 : 24 ); |
There was a problem hiding this comment.
conditional operator is used as sub-expression of parent conditional operator, refrain from using nested conditional operators
| { | ||
| uint32_t id2; | ||
| uint8_t race; | ||
| cost_t cost; | ||
| }; | ||
|
|
||
| const buildstats_t _builds[] = { | ||
| const BuildingStats buildingStats[] = { |
There was a problem hiding this comment.
do not declare C-style arrays, use std::array<> instead
| } | ||
| } | ||
| else if ( MP2::isInGameActionObject( objectType ) ) { | ||
| _mapActionObjects.emplace( iter, IndexObject{ mapIndex, objectType } ); |
There was a problem hiding this comment.
unnecessary temporary object created while calling emplace
| _mapActionObjects.emplace( iter, IndexObject{ mapIndex, objectType } ); | |
| _mapActionObjects.emplace( iter, mapIndex, objectType ); |
|
|
||
| // XMI files play MIDI at a fixed clock rate of 120 Hz | ||
| if ( !tracks.empty() && tracks.front().events.trackTempo > 0 ) { | ||
| ppqn = ( tracks.front().events.trackTempo * 3 / 25000 ); |
There was a problem hiding this comment.
narrowing conversion from uint32_t (aka unsigned int) to signed type int is implementation-defined
| return {}; | ||
| } | ||
|
|
||
| StreamBuf sb( 16 * 4096 ); |
There was a problem hiding this comment.
performing an implicit widening conversion to type size_t (aka unsigned long) of a multiplication performed in type int
| for ( const BuildOrder & order : buildOrder ) { | ||
| const BuildingStatus status = castle->CheckBuyBuilding( order.building ); | ||
| if ( status == BuildingStatus::LACK_RESOURCES ) { | ||
| Funds missing = PaymentConditions::BuyBuilding( race, order.building ) - kindgomFunds; |
There was a problem hiding this comment.
variable missing of type Funds can be declared const
| Funds missing = PaymentConditions::BuyBuilding( race, order.building ) - kindgomFunds; | |
| Funds const missing = PaymentConditions::BuyBuilding( race, order.building ) - kindgomFunds; |
| budgetEntry.recurringCost = true; | ||
| } | ||
| if ( castle->isBuild( DWELLING_MONSTER6 ) ) { | ||
| Funds bestUnitCost = Monster( race, DWELLING_MONSTER6 ).GetUpgrade().GetCost(); |
There was a problem hiding this comment.
variable bestUnitCost of type Funds can be declared const
| Funds bestUnitCost = Monster( race, DWELLING_MONSTER6 ).GetUpgrade().GetCost(); | |
| Funds const bestUnitCost = Monster( race, DWELLING_MONSTER6 ).GetUpgrade().GetCost(); |
| if ( toRes == Resource::GOLD ) { | ||
| fromResBalanceAmount -= 1; | ||
| toResBalanceAmount += tradeCost; | ||
| const int32_t tradeCost = fheroes2::getTradeCost( marketplaceCount, fromRes, toRes ); |
There was a problem hiding this comment.
narrowing conversion from uint32_t (aka unsigned int) to signed type int32_t (aka int) is implementation-defined
| } | ||
|
|
||
| if ( resToExchange == Resource::UNKNOWN ) { | ||
| return {}; | ||
| const int32_t tradeCost = fheroes2::getTradeCost( marketplaceCount, res, missingRes ); |
There was a problem hiding this comment.
narrowing conversion from uint32_t (aka unsigned int) to signed type int32_t (aka int) is implementation-defined
| int startAutoBattle | ||
| = fheroes2::showMessage( fheroes2::Text( "", {} ), fheroes2::Text( _( "Are you sure you want to enable auto combat?" ), fheroes2::FontType::normalWhite() ), | ||
| Dialog::YES | Dialog::NO ); | ||
| int startAutoBattle = fheroes2::showStandardTextMessage( {}, _( "Are you sure you want to enable auto combat?" ), Dialog::YES | Dialog::NO ); |
There was a problem hiding this comment.
variable startAutoBattle of type int can be declared const
| int startAutoBattle = fheroes2::showStandardTextMessage( {}, _( "Are you sure you want to enable auto combat?" ), Dialog::YES | Dialog::NO ); | |
| int const startAutoBattle = fheroes2::showStandardTextMessage( {}, _( "Are you sure you want to enable auto combat?" ), Dialog::YES | Dialog::NO ); |
| uint32_t cur = resource.Get( rs ); | ||
| uint32_t sel = cur; | ||
| uint32_t max = mul > 1 ? ( funds.Get( rs ) + resource.Get( rs ) ) / mul : funds.Get( rs ) + resource.Get( rs ); | ||
| int32_t cur = resource.Get( rs ); |
There was a problem hiding this comment.
variable cur of type int32_t (aka int) can be declared const
| int32_t cur = resource.Get( rs ); | |
| int32_t const cur = resource.Get( rs ); |
| case DWELLING_MONSTER6: | ||
| return building & DWELLING_UPGRADE7 ? DWELLING_UPGRADE7 : ( building & DWELLING_UPGRADE6 ? DWELLING_UPGRADE6 : buildId ); | ||
| return _constructedBuildings & DWELLING_UPGRADE7 ? DWELLING_UPGRADE7 : ( _constructedBuildings & DWELLING_UPGRADE6 ? DWELLING_UPGRADE6 : buildId ); |
There was a problem hiding this comment.
conditional operator is used as sub-expression of parent conditional operator, refrain from using nested conditional operators
| while ( currentEntry < regionsToCheck.size() ) { | ||
| const MapRegion & region = world.getRegion( regionsToCheck[currentEntry].first ); | ||
|
|
||
| for ( uint32_t secondaryID : region._neighbours ) { |
There was a problem hiding this comment.
variable secondaryID of type uint32_t (aka unsigned int) can be declared const
| for ( uint32_t secondaryID : region._neighbours ) { | |
| for ( uint32_t const secondaryID : region._neighbours ) { |
| if ( hero && hero->GetArmy().GetStrength() <= enemyStrength * ARMY_ADVANTAGE_SMALL ) { | ||
| return true; | ||
| } | ||
|
|
||
| return false; |
There was a problem hiding this comment.
redundant boolean literal in conditional return statement
| if ( hero && hero->GetArmy().GetStrength() <= enemyStrength * ARMY_ADVANTAGE_SMALL ) { | |
| return true; | |
| } | |
| return false; | |
| return hero && hero->GetArmy().GetStrength() <= enemyStrength * ARMY_ADVANTAGE_SMALL; |
| @@ -50,7 +50,7 @@ struct spellstats_t | |||
| // The original resources don't have most of sprites for Mass Spells | |||
| // so we made some tricks in AGG source file. All modified sprite IDs start from 60 | |||
|
|
|||
| spellstats_t spells[] = { | |||
| const SpellStats spells[Spell::SPELL_COUNT] = { | |||
There was a problem hiding this comment.
do not declare C-style arrays, use std::array<> instead
| const CastleDefenseElement target = Catapult::GetTarget( stateOfCatapultTargets, _randomGenerator ); | ||
| const uint32_t damage = std::min( _catapult->GetDamage( _randomGenerator ), stateOfCatapultTargets[target] ); | ||
| const bool hit = _catapult->IsNextShotHit( _randomGenerator ); | ||
| cmd << shots; |
There was a problem hiding this comment.
narrowing conversion from uint32_t (aka unsigned int) to signed type int is implementation-defined
| void showPopup( const int buttons ) const override; | ||
|
|
||
| private: | ||
| const Monster _monster; |
There was a problem hiding this comment.
member _monster of type const Monster is const qualified
| const double spellPointValue = retreating ? outcome.value : outcome.value / sqrt( spell.spellPoints( _commander ) / 3.0 ); | ||
| const bool ignoreThreshold = retreating || spell.isResurrect(); | ||
|
|
||
| DEBUG_LOG( DBG_BATTLE, DBG_TRACE, spell.GetName() << " value is " << spellPointValue << ", best target is " << outcome.cell ) |
There was a problem hiding this comment.
inside a lambda, __FUNCTION__ expands to the name of the function call operator; consider capturing the name of the enclosing function explicitly
| // Slow is useless against archers or troops defending castle | ||
| return 0.01; | ||
| } | ||
| const int currentSpeed = target.GetSpeed( false, true ); |
There was a problem hiding this comment.
narrowing conversion from uint32_t (aka unsigned int) to signed type int is implementation-defined
|
|
||
| double AI::BattlePlanner::getSpellHasteRatio( const Battle::Unit & target ) const | ||
| { | ||
| const int currentSpeed = target.GetSpeed( false, true ); |
There was a problem hiding this comment.
narrowing conversion from uint32_t (aka unsigned int) to signed type int is implementation-defined
| return 0.0; | ||
| } | ||
|
|
||
| if ( target.Modes( Battle::SP_BLESS ) && ( spellID == Spell::CURSE || spellID == Spell::MASSCURSE ) ) { |
There was a problem hiding this comment.
repeated branch body in conditional chain
:(