浏览代码

remove test

Laserlicht 10 月之前
父节点
当前提交
1fb5301750
共有 2 个文件被更改,包括 3 次插入2 次删除
  1. 3 0
      client/adventureMap/AdventureMapInterface.cpp
  2. 0 2
      client/mainmenu/CMainMenu.cpp

+ 3 - 0
client/adventureMap/AdventureMapInterface.cpp

@@ -34,6 +34,7 @@
 #include "../render/IImage.h"
 #include "../render/IImage.h"
 #include "../render/IRenderHandler.h"
 #include "../render/IRenderHandler.h"
 #include "../render/IScreenHandler.h"
 #include "../render/IScreenHandler.h"
+#include "../render/AssetGenerator.h"
 #include "../CMT.h"
 #include "../CMT.h"
 #include "../PlayerLocalState.h"
 #include "../PlayerLocalState.h"
 #include "../CPlayerInterface.h"
 #include "../CPlayerInterface.h"
@@ -64,6 +65,8 @@ AdventureMapInterface::AdventureMapInterface():
 	pos.w = GH.screenDimensions().x;
 	pos.w = GH.screenDimensions().x;
 	pos.h = GH.screenDimensions().y;
 	pos.h = GH.screenDimensions().y;
 
 
+	AssetGenerator::createPaletteShiftedSprites();
+
 	shortcuts = std::make_shared<AdventureMapShortcuts>(*this);
 	shortcuts = std::make_shared<AdventureMapShortcuts>(*this);
 
 
 	widget = std::make_shared<AdventureMapWidget>(shortcuts);
 	widget = std::make_shared<AdventureMapWidget>(shortcuts);

+ 0 - 2
client/mainmenu/CMainMenu.cpp

@@ -310,8 +310,6 @@ void CMainMenu::playIntroVideos()
 			cb(true);
 			cb(true);
 	};
 	};
 
 
-	AssetGenerator::generateAll();
-
 	playVideo("3DOLOGO.SMK", false, 1.25, [playVideo, this](bool skipped){
 	playVideo("3DOLOGO.SMK", false, 1.25, [playVideo, this](bool skipped){
 		if(!skipped)
 		if(!skipped)
 			playVideo("NWCLOGO.SMK", false, 2, [playVideo, this](bool skipped){
 			playVideo("NWCLOGO.SMK", false, 2, [playVideo, this](bool skipped){