- Crashfix for when loading an bswf with no abcTagdata

HarrievG · RobertBeckebans · commit 3b9d993f414f · 2024-02-27T20:53:43.000+01:00
- Removed redundant forward declare
diff --git a/neo/swf/SWF_Load.cpp b/neo/swf/SWF_Load.cpp
@@ -634,7 +634,10 @@ bool idSWF::LoadBinary( const char* bfilename, ID_TIME_T sourceTimeStamp )
 			f->ReadString( symbolClasses.symbols[i].name );
 		}
 
-		DoABC( abcFile.AbcTagData );
+		if ( abcFile.AbcTagData.Length() )
+		{		
+			DoABC( abcFile.AbcTagData );
+		}
 	}
 
 	delete f;
diff --git a/neo/swf/SWF_ShapeParser.h b/neo/swf/SWF_ShapeParser.h
@@ -36,7 +36,6 @@ This class handles parsing and triangulating a shape
 class idSWFShapeParser
 {
 public:
-	struct swfSPDrawLine_t;
 	idSWFShapeParser() { }
 	void Parse( idSWFBitStream& bitstream, idSWFShape& shape, int recordType );
 	void ParseMorph( idSWFBitStream& bitstream, idSWFShape& shape );

Original file line number	Diff line number	Diff line change
`@@ -634,7 +634,10 @@ bool idSWF::LoadBinary( const char* bfilename, ID_TIME_T sourceTimeStamp )`
`634`	`634`	`f->ReadString( symbolClasses.symbols[i].name );`
`635`	`635`	`}`
`636`	`636`
`637`		`- DoABC( abcFile.AbcTagData );`
	`637`	`+ if ( abcFile.AbcTagData.Length() )`
	`638`	`+ {`
	`639`	`+ DoABC( abcFile.AbcTagData );`
	`640`	`+ }`
`638`	`641`	`}`
`639`	`642`
`640`	`643`	`delete f;`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ This class handles parsing and triangulating a shape`
`36`	`36`	`class idSWFShapeParser`
`37`	`37`	`{`
`38`	`38`	`public:`
`39`		`- struct swfSPDrawLine_t;`
`40`	`39`	`idSWFShapeParser() { }`
`41`	`40`	`void Parse( idSWFBitStream& bitstream, idSWFShape& shape, int recordType );`
`42`	`41`	`void ParseMorph( idSWFBitStream& bitstream, idSWFShape& shape );`