|
20 | 20 |
|
21 | 21 | #include <fstream> |
22 | 22 |
|
23 | | -#include "graphics/mesh/submesh/staticmesh.h" |
24 | | -#include "graphics/mesh/submesh/animmesh.h" |
25 | 23 | #include "graphics/mesh/submesh/pfxemittermesh.h" |
26 | 24 | #include "graphics/mesh/submesh/packedmesh.h" |
27 | 25 | #include "graphics/mesh/skeleton.h" |
28 | 26 | #include "graphics/mesh/protomesh.h" |
29 | 27 | #include "graphics/mesh/animation.h" |
30 | 28 | #include "graphics/mesh/attachbinder.h" |
31 | 29 | #include "graphics/material.h" |
32 | | -#include "physics/physicmeshshape.h" |
33 | | -#include "dmusic/music.h" |
34 | 30 | #include "dmusic/directmusic.h" |
35 | 31 | #include "utils/fileext.h" |
36 | 32 | #include "utils/gthfont.h" |
@@ -119,8 +115,15 @@ void Resources::loadVdfs(const std::vector<std::u16string>& modvdfs, bool modFil |
119 | 115 | std::make_tuple(bIsMod,b.time,int(b.ord)); |
120 | 116 | }); |
121 | 117 |
|
122 | | - for(auto& i:archives) |
123 | | - inst->gothicAssets.merge(phoenix::vdf_file::open(i.name), false); |
| 118 | + for(auto& i:archives) { |
| 119 | + try { |
| 120 | + inst->gothicAssets.merge(phoenix::vdf_file::open(i.name), false); |
| 121 | + } |
| 122 | + catch(...) { |
| 123 | + Log::e("unable to load archive: \"", TextCodec::toUtf8(i.name), "\""); |
| 124 | + } |
| 125 | + } |
| 126 | + inst->gothicAssets.entries.size(); |
124 | 127 |
|
125 | 128 | //for(auto& i:gothicAssets.getKnownFiles()) |
126 | 129 | // Log::i(i); |
|
0 commit comments