weapondef fixes

ZoneTool · Nov 29, 2020 · 365ea81 · 365ea81
1 parent adf5c7b
commit 365ea81
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/IW4/Assets/WeaponDef.cpp b/src/IW4/Assets/WeaponDef.cpp
@@ -15,6 +15,9 @@ namespace ZoneTool
 	{		
 		void IWeaponDef::dump(WeaponCompleteDef* weapon)
 		{
+			return;
+
+			// experimental iw5 dump code
 			auto iw5_weapon = new IW5::WeaponCompleteDef;
 			memset(iw5_weapon, 0, sizeof IW5::WeaponCompleteDef);
 

diff --git a/src/IW5/Assets/WeaponDef.cpp b/src/IW5/Assets/WeaponDef.cpp
@@ -1587,10 +1587,7 @@ namespace ZoneTool
 #define WEAPON_DUMP_FIELD_ARR(__field__, __size__) \
 	for (auto idx##__field__ = 0; idx##__field__ < __size__; idx##__field__++) \
 	{ \
-		if (asset->__field__ && asset->__field__[idx##__field__]) \
-			data[#__field__][idx##__field__] = asset->__field__[idx##__field__]; \
-		else \
-			data[#__field__][idx##__field__] = ""; \
+		data[#__field__][idx##__field__] = asset->__field__[idx##__field__]; \
 	}
 
 #define WEAPON_DUMP_ASSET(__field__) \