Skip to content

Commit 418eef2

Browse files
committed
removing unnecessary asserts in hrawanim
1 parent b7b9c83 commit 418eef2

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -216,11 +216,8 @@ int HRawAnimClass::Load_W3D(ChunkLoadClass & cload)
216216
strlcat(Name, ".", ARRAY_SIZE(Name));
217217
strlcat(Name, aheader.Name, ARRAY_SIZE(Name));
218218

219-
// TSS chasing crash bug 05/26/99
220-
WWASSERT(HierarchyName != NULL);
221-
WWASSERT(aheader.HierarchyName != NULL);
222-
static_assert(ARRAY_SIZE(HierarchyName) >= ARRAY_SIZE(aheader.HierarchyName), "Incorrect array size");
223-
strcpy(HierarchyName, aheader.HierarchyName);
219+
static_assert(ARRAY_SIZE(HierarchyName) >= ARRAY_SIZE(aheader.HierarchyName), "Incorrect array size");
220+
strcpy(HierarchyName, aheader.HierarchyName);
224221

225222
HTreeClass * base_pose = WW3DAssetManager::Get_Instance()->Get_HTree(HierarchyName);
226223
if (base_pose == NULL) {

GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -216,11 +216,8 @@ int HRawAnimClass::Load_W3D(ChunkLoadClass & cload)
216216
strlcat(Name, ".", ARRAY_SIZE(Name));
217217
strlcat(Name, aheader.Name, ARRAY_SIZE(Name));
218218

219-
// TSS chasing crash bug 05/26/99
220-
WWASSERT(HierarchyName != NULL);
221-
WWASSERT(aheader.HierarchyName != NULL);
222-
static_assert(ARRAY_SIZE(HierarchyName) >= ARRAY_SIZE(aheader.HierarchyName), "Incorrect array size");
223-
strcpy(HierarchyName, aheader.HierarchyName);
219+
static_assert(ARRAY_SIZE(HierarchyName) >= ARRAY_SIZE(aheader.HierarchyName), "Incorrect array size");
220+
strcpy(HierarchyName, aheader.HierarchyName);
224221

225222
HTreeClass * base_pose = WW3DAssetManager::Get_Instance()->Get_HTree(HierarchyName);
226223
if (base_pose == NULL) {

0 commit comments

Comments
 (0)