adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some cleanups to planet stuff, from PhracturedBlue

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@323 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
gewlitys
2002-12-04 18:41:22 +00:00
parent 0eb4f889fd
commit 596876279e
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/planets/pl_stuff.c
+1
View File
@@ -532,6 +532,7 @@ RotatePlanet (int x, int da, int dx, int dy, int zoom)
COUNT frameh,this_scale; COUNT frameh,this_scale;
if(pSolarSysState->ScaleFrame[i]) { if(pSolarSysState->ScaleFrame[i]) {
DestroyDrawable (ReleaseDrawable (pSolarSysState->ScaleFrame[i])); DestroyDrawable (ReleaseDrawable (pSolarSysState->ScaleFrame[i]));
pSolarSysState->ScaleFrame[i]=0;
} }
frameh=GetFrameHeight(pFrame[i]); frameh=GetFrameHeight(pFrame[i]);
this_scale=frameh*scale_amt/MAP_HEIGHT; this_scale=frameh*scale_amt/MAP_HEIGHT;
sc2/src/sc2code/planets/planets.c
+4 -3
View File
@@ -216,6 +216,8 @@ FreePlanet (void)
for(i=0;i<255;i++) { for(i=0;i<255;i++) {
DestroyDrawable (ReleaseDrawable (pSolarSysState->PlanetFrameArray[i])); DestroyDrawable (ReleaseDrawable (pSolarSysState->PlanetFrameArray[i]));
} }
free(pSolarSysState->PlanetFrameArray);
free(pSolarSysState->isPFADefined);
for(i=0;i<2;i++) { for(i=0;i<2;i++) {
if(pSolarSysState->ScaleFrame[i]) { if(pSolarSysState->ScaleFrame[i]) {
DestroyDrawable (ReleaseDrawable (pSolarSysState->ScaleFrame[i])); DestroyDrawable (ReleaseDrawable (pSolarSysState->ScaleFrame[i]));
@@ -226,14 +228,13 @@ FreePlanet (void)
DestroyDrawable (ReleaseDrawable (pSolarSysState->ShieldFrame)); DestroyDrawable (ReleaseDrawable (pSolarSysState->ShieldFrame));
pSolarSysState->ShieldFrame=0; pSolarSysState->ShieldFrame=0;
} }
if(pSolarSysState->lpTopoMap!=NULL) { if(pSolarSysState->lpTopoMap!=0) {
for(i=0;pSolarSysState->lpTopoMap[i]!=NULL;i++) { for(i=0;pSolarSysState->lpTopoMap[i]!=NULL;i++) {
free(pSolarSysState->lpTopoMap[i]); free(pSolarSysState->lpTopoMap[i]);
} }
free(pSolarSysState->lpTopoMap); free(pSolarSysState->lpTopoMap);
pSolarSysState->lpTopoMap=0;
} }
free(pSolarSysState->PlanetFrameArray);
free(pSolarSysState->isPFADefined);
DestroyContext (ReleaseContext (TaskContext)); DestroyContext (ReleaseContext (TaskContext));
TaskContext = 0; TaskContext = 0;