[Sc2-cvs] SF.net SVN: sc2:[3766] trunk/sc2/src

[<av...@us...>]

Revision: 3766
          http://sc2.svn.sourceforge.net/sc2/?rev=3766&view=rev
Author:   avolkov
Date:     2012-02-12 20:01:20 +0000 (Sun, 12 Feb 2012)
Log Message:
-----------
Remove dated SCREEN_DRAWABLE logic to allow for Screen FRAME cleanup; bug #1149

Modified Paths:
--------------
    trunk/sc2/src/libs/graphics/gfxload.c
    trunk/sc2/src/uqm/cleanup.c

Modified: trunk/sc2/src/libs/graphics/gfxload.c
===================================================================
--- trunk/sc2/src/libs/graphics/gfxload.c	2012-02-12 19:10:15 UTC (rev 3765)
+++ trunk/sc2/src/libs/graphics/gfxload.c	2012-02-12 20:01:20 UTC (rev 3766)
@@ -321,16 +321,8 @@
 		return (FALSE);
 
 	cel_ct = DrawablePtr->MaxIndex + 1;
+	FramePtr = DrawablePtr->Frame;
 
-	if (DrawablePtr->Frame)
-	{
-		FramePtr = DrawablePtr->Frame;
-		if (FramePtr->Type == SCREEN_DRAWABLE)
-		{
-			FramePtr = NULL;
-		}
-	}
-
 	HFree (handle);
 	if (FramePtr)
 	{

Modified: trunk/sc2/src/uqm/cleanup.c
===================================================================
--- trunk/sc2/src/uqm/cleanup.c	2012-02-12 19:10:15 UTC (rev 3765)
+++ trunk/sc2/src/uqm/cleanup.c	2012-02-12 20:01:20 UTC (rev 3766)
@@ -39,7 +39,9 @@
 	UninitResourceSystem ();
 
 	DestroyDrawable (ReleaseDrawable (Screen));
+	Screen = 0;
 	DestroyContext (ScreenContext);
+	ScreenContext = 0;
 
 	UninitVideoPlayer ();
 	UninitSound ();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.