games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/develop' into fix_rmg_teams

Browse Source 
# Conflicts:
#	lib/rmg/CMapGenOptions.cpp
#	lib/rmg/CMapGenOptions.h
This commit is contained in:
Tomasz Zieliński
2023-11-07 20:54:04 +01:00
parent 6e7b68d0e6 3fe10f9c7b
commit c909bd766e
159 changed files with 1727 additions and 1726 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/game/CGameStateTest.cpp
View File

@@ -240,7 +240,7 @@ TEST_F(CGameStateTest, issue2765)
gameCallback->sendAndApply(&na);
PutArtifact pack;
pack.al = ArtifactLocation(defender, ArtifactPosition::MACH1);
pack.al = ArtifactLocation(defender->id, ArtifactPosition::MACH1);
pack.art = a;
gameCallback->sendAndApply(&pack);
}
@@ -334,7 +334,7 @@ TEST_F(CGameStateTest, battleResurrection)
gameCallback->sendAndApply(&na);
PutArtifact pack;
pack.al = ArtifactLocation(attacker, ArtifactPosition::SPELLBOOK);
pack.al = ArtifactLocation(attacker->id, ArtifactPosition::SPELLBOOK);
pack.art = a;
gameCallback->sendAndApply(&pack);
}