diff --git a/client/mainmenu/CMainMenu.cpp b/client/mainmenu/CMainMenu.cpp index f3702101c..a346a2adf 100644 --- a/client/mainmenu/CMainMenu.cpp +++ b/client/mainmenu/CMainMenu.cpp @@ -310,6 +310,8 @@ void CMainMenu::playIntroVideos() cb(true); }; + AssetGenerator::generateAll(); + playVideo("3DOLOGO.SMK", false, 1.25, [playVideo, this](bool skipped){ if(!skipped) playVideo("NWCLOGO.SMK", false, 2, [playVideo, this](bool skipped){ diff --git a/client/mapView/MapRenderer.cpp b/client/mapView/MapRenderer.cpp index 9b56ccd9d..aa4e4221d 100644 --- a/client/mapView/MapRenderer.cpp +++ b/client/mapView/MapRenderer.cpp @@ -125,7 +125,7 @@ std::shared_ptr MapTileStorage::find(size_t fileIndex, size_t rotationIn { const auto & animation = animations[fileIndex][rotationIndex]; if (animation) - return animation->getImage(imageIndex); + return animation->getImage(imageIndex); // ask for group else return nullptr; } @@ -156,8 +156,8 @@ void MapRendererTerrain::renderTile(IMapRendererContext & context, Canvas & targ return; } - for( auto const & element : mapTile.getTerrain()->paletteAnimation) - image->shiftPalette(element.start, element.length, context.terrainImageIndex(element.length)); +// for( auto const & element : mapTile.getTerrain()->paletteAnimation) +// image->shiftPalette(element.start, element.length, context.terrainImageIndex(element.length)); target.draw(image, Point(0, 0)); } @@ -193,8 +193,8 @@ void MapRendererRiver::renderTile(IMapRendererContext & context, Canvas & target const auto & image = storage.find(terrainIndex, rotationIndex, imageIndex); - for( auto const & element : mapTile.getRiver()->paletteAnimation) - image->shiftPalette(element.start, element.length, context.terrainImageIndex(element.length)); + //for( auto const & element : mapTile.getRiver()->paletteAnimation) + // image->shiftPalette(element.start, element.length, context.terrainImageIndex(element.length)); target.draw(image, Point(0, 0)); } diff --git a/client/render/AssetGenerator.h b/client/render/AssetGenerator.h index 2eb73a886..8ca08aae6 100644 --- a/client/render/AssetGenerator.h +++ b/client/render/AssetGenerator.h @@ -23,4 +23,5 @@ public: static void createCombatUnitNumberWindow(); static void createCampaignBackground(); static void createChroniclesCampaignImages(); + static void createPaletteShiftedSprites(); };