Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not use unnecessary memory on atmosphere effects when no atmosphere effects are in use. 

Based on patch by wolftrak in ticket:4079, closes ticket:4079
master
per 2013-09-28 21:19:15 +02:00
parent feb2ae5af8
commit b57d0688d0
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/atmos.cpp
View File

@ -53,27 +53,24 @@ enum AP_TYPE
enum AP_STATUS
{
APS_ACTIVE,
APS_INACTIVE
APS_INACTIVE,
APS_ACTIVE
};
static ATPART asAtmosParts[MAX_ATMOS_PARTICLES];
static ATPART *asAtmosParts = NULL;
static UDWORD freeParticle;
static UDWORD weather;
static WT_CLASS weather = WT_NONE;
/* Setup all the particles */
void atmosInitSystem()
{
for (int i = 0; i < MAX_ATMOS_PARTICLES; i++)
if (!asAtmosParts && weather != WT_NONE)
{
/* None are being used initially */
asAtmosParts[i].status = APS_INACTIVE;
// calloc sets all to APS_INACTIVE initially
asAtmosParts = (ATPART *)calloc(MAX_ATMOS_PARTICLES, sizeof(*asAtmosParts));
}
/* Start at the beginning */
freeParticle = 0;
/* No weather to start with */
weather = WT_NONE;
}
/* Makes a particle wrap around - if it goes off the grid, then it returns
@ -287,8 +284,6 @@ void atmosUpdateSystem()
break;
case WT_NONE:
break;
default:
break;
}
}
}
@ -341,17 +336,19 @@ void renderParticle(ATPART *psPart)
void atmosSetWeatherType(WT_CLASS type)
{
if (type == WT_NONE)
{
atmosInitSystem();
}
else
if (type != weather)
{
weather = type;
atmosInitSystem();
}
if (type == WT_NONE && asAtmosParts)
{
free(asAtmosParts);
asAtmosParts = NULL;
}
}
WT_CLASS atmosGetWeatherType()
{
return (WT_CLASS)weather;
return weather;
}

2
src/init.cpp
View File

@ -930,6 +930,8 @@ bool stageOneShutDown(void)
{
debug(LOG_WZ, "== stageOneShutDown ==");
atmosSetWeatherType(WT_NONE); // reset weather and free its data
pie_FreeShaders();
if ( audio_Disabled() == false )