fixed merge error

HarrievG · RobertBeckebans · commit 37bf67ef8c8a · 2024-02-27T20:53:43.000+01:00
diff --git a/neo/swf/SWF_SpriteInstance.cpp b/neo/swf/SWF_SpriteInstance.cpp
@@ -247,7 +247,8 @@ swfDisplayEntry_t* idSWFSpriteInstance::AddDisplayEntry( int depth, int characte
 				{
 					display.textInstance->scriptObject.DeepCopy( dcopy.GetObject() );
 				}
-				super->SetPrototype( display.textInstance->scriptObject.GetPrototype() );
+				
+				display.textInstance->scriptObject.SetPrototype( super );
 			}
 
 			display.textInstance->Init( dictEntry->edittext, sprite->GetSWF() );

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,8 @@ swfDisplayEntry_t* idSWFSpriteInstance::AddDisplayEntry( int depth, int characte`
`247`	`247`	`{`
`248`	`248`	`display.textInstance->scriptObject.DeepCopy( dcopy.GetObject() );`
`249`	`249`	`}`
`250`		`- super->SetPrototype( display.textInstance->scriptObject.GetPrototype() );`
	`250`	`+`
	`251`	`+ display.textInstance->scriptObject.SetPrototype( super );`
`251`	`252`	`}`
`252`	`253`
`253`	`254`	`display.textInstance->Init( dictEntry->edittext, sprite->GetSWF() );`