@@ -1438,7 +1438,6 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void
14381438 { " AltTurretArtAngle" , INI ::parseAngleReal, nullptr , offsetof (ModelConditionInfo, m_turrets[1 ].m_turretArtAngle ) },
14391439 { " AltTurretPitch" , parseBoneNameKey, nullptr , offsetof (ModelConditionInfo, m_turrets[1 ].m_turretPitchNameKey ) },
14401440 { " AltTurretArtPitch" , INI ::parseAngleReal, nullptr , offsetof (ModelConditionInfo, m_turrets[1 ].m_turretArtPitch ) },
1441- { " ShowSubObject" , parseShowHideSubObject, (void *)nullptr , offsetof (ModelConditionInfo, m_hideShowVec) },
14421441 { " Turret1ArtAngle" , INI ::parseAngleReal, nullptr , offsetof (ModelConditionInfo, m_turrets[0 ].m_turretArtAngle ) },
14431442 { " Turret1Pitch" , parseBoneNameKey, nullptr , offsetof (ModelConditionInfo, m_turrets[0 ].m_turretPitchNameKey ) },
14441443 { " Turret1ArtPitch" , INI ::parseAngleReal, nullptr , offsetof (ModelConditionInfo, m_turrets[0 ].m_turretArtPitch ) },
@@ -1470,7 +1469,7 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void
14701469 { " Turret8ArtAngle" , INI ::parseAngleReal, nullptr , offsetof (ModelConditionInfo, m_turrets[7 ].m_turretArtAngle ) },
14711470 { " Turret8Pitch" , parseBoneNameKey, nullptr , offsetof (ModelConditionInfo, m_turrets[7 ].m_turretPitchNameKey ) },
14721471 { " Turret8ArtPitch" , INI ::parseAngleReal, nullptr , offsetof (ModelConditionInfo, m_turrets[7 ].m_turretArtPitch ) },
1473- { " ShowSubObject" , parseShowHideSubObject, (void *)0 , offsetof (ModelConditionInfo, m_hideShowVec) },
1472+ { " ShowSubObject" , parseShowHideSubObject, (void *)nullptr , offsetof (ModelConditionInfo, m_hideShowVec) },
14741473 { " HideSubObject" , parseShowHideSubObject, (void *)1 , offsetof (ModelConditionInfo, m_hideShowVec) },
14751474 { " WeaponFireFXBone" , parseWeaponBoneName, nullptr , offsetof (ModelConditionInfo, m_weaponFireFXBoneName[0 ]) },
14761475 { " WeaponRecoilBone" , parseWeaponBoneName, nullptr , offsetof (ModelConditionInfo, m_weaponRecoilBoneName[0 ]) },
0 commit comments