techset fixes for iw3

ZoneTool · Oct 30, 2019 · 46c1c14 · 46c1c14
1 parent 4072b9e
commit 46c1c14
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/IW3/Assets/Material.cpp b/src/IW3/Assets/Material.cpp
@@ -99,7 +99,11 @@ namespace ZoneTool
 				}
 
 				auto file = FileSystem::FileOpen(path, "wb");
-
+				if (!file)
+				{
+					return;
+				}
+
 				nlohmann::json matdata;
 
 				MATERIAL_DUMP_STRING(name);
@@ -120,7 +124,6 @@ namespace ZoneTool
 				MATERIAL_DUMP_INT(stateFlags);
 				MATERIAL_DUMP_INT(cameraRegion);
 
-				MATERIAL_DUMP_BITS_ENTRY(stateBitsEntry, 34);
 				MATERIAL_DUMP_CONST_ARRAY(constantTable, mat->constantCount);
 				MATERIAL_DUMP_STATE_MAP(stateMap, mat->stateBitsCount);
 

diff --git a/src/IW3/Assets/Techset.cpp b/src/IW3/Assets/Techset.cpp
@@ -96,7 +96,7 @@ namespace ZoneTool
 			// convert to IW4
 			auto asset = new IW4::VertexDecl;
 			memset(asset, 0, sizeof IW4::VertexDecl);
-
+			
 			asset->name = name;
 
 			asset->hasOptionalSource = vertex->hasOptionalSource;