File tree Expand file tree Collapse file tree 3 files changed +9
-12
lines changed Expand file tree Collapse file tree 3 files changed +9
-12
lines changed Original file line number Diff line number Diff line change @@ -144,19 +144,8 @@ void xrLoad(LPCSTR name, bool draft_mode)
144144 IReader* THM = FS.r_open (" $game_textures$" , N);
145145 R_ASSERT2 (THM, N);
146146
147- // version
148- u32 version = 0 ;
149- R_ASSERT (THM->r_chunk (THM_CHUNK_VERSION, &version));
150147 // analyze thumbnail information
151- R_ASSERT (THM->find_chunk (THM_CHUNK_TEXTUREPARAM));
152- THM->r (&BT.THM .fmt , sizeof (STextureParams::ETFormat));
153- BT.THM .flags .assign (THM->r_u32 ());
154- BT.THM .border_color = THM->r_u32 ();
155- BT.THM .fade_color = THM->r_u32 ();
156- BT.THM .fade_amount = THM->r_u32 ();
157- BT.THM .mip_filter = THM->r_u32 ();
158- BT.THM .width = THM->r_u32 ();
159- BT.THM .height = THM->r_u32 ();
148+ BT.THM .Load (*THM);
160149 BOOL bLOD = FALSE ;
161150 if (N[0 ] == ' l' && N[1 ] == ' o' && N[2 ] == ' d' && N[3 ] == ' \\ ' )
162151 bLOD = TRUE ;
Original file line number Diff line number Diff line change 154154 </Link >
155155 </ItemDefinitionGroup >
156156 <ItemGroup >
157+ <ClCompile Include =" ..\..\Layers\xrRender\ETextureParams.cpp" />
157158 <ClCompile Include =" ..\..\xrEngine\xrLoadSurface.cpp" />
158159 <ClCompile Include =" ..\..\xrServerEntities\alife_human_brain.cpp" />
159160 <ClCompile Include =" ..\..\xrServerEntities\alife_monster_brain.cpp" />
191192 <ClCompile Include =" xr_graph_merge.cpp" />
192193 </ItemGroup >
193194 <ItemGroup >
195+ <ClInclude Include =" ..\..\Layers\xrRender\ETextureParams.h" />
194196 <ClInclude Include =" ..\..\xrServerEntities\alife_human_brain.h" />
195197 <ClInclude Include =" ..\..\xrServerEntities\alife_human_brain_inline.h" />
196198 <ClInclude Include =" ..\..\xrServerEntities\alife_monster_brain.h" />
Original file line number Diff line number Diff line change 156156 <ClCompile Include =" guid_generator.cpp" >
157157 <Filter >ALife\guid_generator</Filter >
158158 </ClCompile >
159+ <ClCompile Include =" ..\..\Layers\xrRender\ETextureParams.cpp" >
160+ <Filter >Compiler</Filter >
161+ </ClCompile >
159162 </ItemGroup >
160163 <ItemGroup >
161164 <ClInclude Include =" AIMapExport.h" >
332335 <ClInclude Include =" resource.h" >
333336 <Filter >Resources</Filter >
334337 </ClInclude >
338+ <ClInclude Include =" ..\..\Layers\xrRender\ETextureParams.h" >
339+ <Filter >Compiler</Filter >
340+ </ClInclude >
335341 </ItemGroup >
336342 <ItemGroup >
337343 <ResourceCompile Include =" resource.rc" >
You can’t perform that action at this time.
0 commit comments