mirror of
https://github.com/vcmi/vcmi.git
synced 2025-02-03 13:01:33 +02:00
Fix compilation after merge
This commit is contained in:
parent
87ff31531f
commit
32277a007d
@ -1250,7 +1250,7 @@ void CAltarWindow::makeDeal()
|
||||
std::sort(positions.begin(), positions.end(), std::greater<>());
|
||||
|
||||
LOCPLINT->cb->trade(market, mode, positions, {}, {}, hero);
|
||||
arts->artifactsOnAltar.clear();
|
||||
artifactsOfHero->artifactsOnAltar.clear();
|
||||
|
||||
for(auto item : items[0])
|
||||
{
|
||||
|
@ -54,7 +54,7 @@
|
||||
"rarity" : 100
|
||||
},
|
||||
"modes" : ["resource-resource", "resource-player"],
|
||||
"efficacy" : 5,
|
||||
"efficiency" : 5,
|
||||
"title" : "core.genrltxt.159"
|
||||
}
|
||||
}
|
||||
@ -78,7 +78,7 @@
|
||||
"rarity" : 100
|
||||
},
|
||||
"modes" : ["resource-resource", "resource-player"],
|
||||
"efficacy" : 5,
|
||||
"efficiency" : 5,
|
||||
"title" : "core.genrltxt.159"
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user