games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse Source
This commit is contained in:
Xilmi
2024-09-12 14:54:39 +02:00
parent d4fd4ed670 75f8614f26
commit a1a03d4b74
82 changed files with 3565 additions and 1608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/campaign/CampaignState.cpp
View File

@@ -210,9 +210,9 @@ ImagePath CampaignHeader::getLoadingBackground() const
return loadingBackground;
}
ImagePath CampaignHeader::getIntroVideoRim() const
ImagePath CampaignHeader::getVideoRim() const
{
return introVideoRim;
return videoRim;
}
VideoPath CampaignHeader::getIntroVideo() const
@@ -220,6 +220,11 @@ VideoPath CampaignHeader::getIntroVideo() const
return introVideo;
}
VideoPath CampaignHeader::getOutroVideo() const
{
return outroVideo;
}
const CampaignRegions & CampaignHeader::getRegions() const
{
return campaignRegions;
@@ -490,10 +495,12 @@ void Campaign::overrideCampaign()
loadLegacyData(CampaignRegions::fromJson(entry.second["regions"]), entry.second["scenarioCount"].Integer());
if(!entry.second["loadingBackground"].isNull())
loadingBackground = ImagePath::builtin(entry.second["loadingBackground"].String());
if(!entry.second["introVideoRim"].isNull())
introVideoRim = ImagePath::builtin(entry.second["introVideoRim"].String());
if(!entry.second["videoRim"].isNull())
videoRim = ImagePath::builtin(entry.second["videoRim"].String());
if(!entry.second["introVideo"].isNull())
introVideo = VideoPath::builtin(entry.second["introVideo"].String());
if(!entry.second["outroVideo"].isNull())
outroVideo = VideoPath::builtin(entry.second["outroVideo"].String());
}
}