games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-05-23 22:40:07 +02:00
Code Issues Releases Activity

Merge pull request #4445 from IvanSavenko/fix_ranged_attack

Browse Source 
Do not try to shoot at 2nd hex of wide creatures
This commit is contained in:
Ivan Savenko 2024-08-14 17:05:12 +03:00 committed by GitHub
commit ac717d57ea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AI/BattleAI/AttackPossibility.cpp
View File

@ -245,7 +245,7 @@ AttackPossibility AttackPossibility::evaluate(
std::vector<BattleHex> defenderHex; std::vector<BattleHex> defenderHex;
if(attackInfo.shooting) if(attackInfo.shooting)
defenderHex = defender->getHexes(); defenderHex.push_back(defender->getPosition());
else else
defenderHex = CStack::meleeAttackHexes(attacker, defender, hex); defenderHex = CStack::meleeAttackHexes(attacker, defender, hex);

6
lib/CConsoleHandler.cpp
View File

@ -168,6 +168,7 @@ LONG WINAPI onUnhandledException(EXCEPTION_POINTERS* exception)
#endif #endif
#ifdef NDEBUG
[[noreturn]] static void onTerminate() [[noreturn]] static void onTerminate()
{ {
logGlobal->error("Disaster happened."); logGlobal->error("Disaster happened.");
@ -205,6 +206,7 @@ LONG WINAPI onUnhandledException(EXCEPTION_POINTERS* exception)
#endif #endif
std::abort(); std::abort();
} }
#endif
void CConsoleHandler::setColor(EConsoleTextColor::EConsoleTextColor color) void CConsoleHandler::setColor(EConsoleTextColor::EConsoleTextColor color)
{ {
@ -296,14 +298,14 @@ CConsoleHandler::CConsoleHandler():
GetConsoleScreenBufferInfo(handleErr, &csbi); GetConsoleScreenBufferInfo(handleErr, &csbi);
defErrColor = csbi.wAttributes; defErrColor = csbi.wAttributes;
#ifndef _DEBUG #ifdef NDEBUG
SetUnhandledExceptionFilter(onUnhandledException); SetUnhandledExceptionFilter(onUnhandledException);
#endif #endif
#else #else
defColor = "\x1b[0m"; defColor = "\x1b[0m";
#endif #endif
#ifndef _DEBUG #ifdef NDEBUG
std::set_terminate(onTerminate); std::set_terminate(onTerminate);
#endif #endif
} }

3
lib/battle/CBattleInfoCallback.cpp
View File

@ -173,6 +173,9 @@ bool CBattleInfoCallback::battleIsInsideWalls(BattleHex from) const
bool CBattleInfoCallback::battleHasPenaltyOnLine(BattleHex from, BattleHex dest, bool checkWall, bool checkMoat) const bool CBattleInfoCallback::battleHasPenaltyOnLine(BattleHex from, BattleHex dest, bool checkWall, bool checkMoat) const
{ {
if (!from.isAvailable() || !dest.isAvailable())
throw std::runtime_error("Invalid hex (" + std::to_string(from.hex) + " and " + std::to_string(dest.hex) + ") received in battleHasPenaltyOnLine!" );
auto isTileBlocked = [&](BattleHex tile) auto isTileBlocked = [&](BattleHex tile)
{ {
EWallPart wallPart = battleHexToWallPart(tile); EWallPart wallPart = battleHexToWallPart(tile);