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

Merge remote-tracking branch 'origin/develop' into terrain-rewrite

Browse Source 
# Conflicts:
#	lib/Terrain.cpp
#	lib/Terrain.h
This commit is contained in:
Tomasz Zieliński
2022-09-23 20:01:13 +02:00
parent f883395710 2b0f02c832
commit a5077245a8
96 changed files with 945 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AI/Nullkiller/Pathfinding/AINodeStorage.cpp
View File

@@ -558,7 +558,7 @@ bool AINodeStorage::selectNextActor()
for(auto actor = actors.begin(); actor != actors.end(); actor++)
{
if(actor->get()->armyValue > currentActor->get()->armyValue
|| actor->get()->armyValue == currentActor->get()->armyValue && actor <= currentActor)
|| (actor->get()->armyValue == currentActor->get()->armyValue && actor <= currentActor))
{
continue;
}