- memory leak fixes
This commit is contained in:
parent
bf87b2c167
commit
9817e8a860
|
@ -477,6 +477,10 @@ void Renderer::manageParticleSystem(ParticleSystem *particleSystem, ResourceScop
|
|||
particleManager[rs]->manage(particleSystem);
|
||||
}
|
||||
|
||||
bool Renderer::validateParticleSystemStillExists(ParticleSystem * particleSystem,ResourceScope rs) const {
|
||||
particleManager[rs]->validateParticleSystemStillExists(particleSystem);
|
||||
}
|
||||
|
||||
void Renderer::cleanupParticleSystems(vector<ParticleSystem *> &particleSystems, ResourceScope rs) {
|
||||
particleManager[rs]->cleanupParticleSystems(particleSystems);
|
||||
}
|
||||
|
|
|
@ -294,6 +294,7 @@ public:
|
|||
void manageParticleSystem(ParticleSystem *particleSystem, ResourceScope rs);
|
||||
void cleanupParticleSystems(vector<ParticleSystem *> &particleSystems,ResourceScope rs);
|
||||
void cleanupUnitParticleSystems(vector<UnitParticleSystem *> &particleSystems,ResourceScope rs);
|
||||
bool validateParticleSystemStillExists(ParticleSystem * particleSystem,ResourceScope rs) const;
|
||||
void updateParticleManager(ResourceScope rs,int renderFps=-1);
|
||||
void renderParticleManager(ResourceScope rs);
|
||||
void swapBuffers();
|
||||
|
|
|
@ -262,8 +262,11 @@ Unit::~Unit(){
|
|||
|
||||
Renderer::getInstance().cleanupParticleSystems(fireParticleSystems,rsGame);
|
||||
// Must set this to null of it will be used below in stopDamageParticles()
|
||||
|
||||
if(Renderer::getInstance().validateParticleSystemStillExists(fire,rsGame) == false) {
|
||||
fire = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
// fade(and by this remove) all unit particle systems
|
||||
while(unitParticleSystems.empty() == false) {
|
||||
|
@ -985,6 +988,10 @@ bool Unit::update() {
|
|||
}
|
||||
}
|
||||
|
||||
if(Renderer::getInstance().validateParticleSystemStillExists(fire,rsGame) == false) {
|
||||
fire = NULL;
|
||||
}
|
||||
|
||||
if (fire != NULL) {
|
||||
fire->setPos(getCurrVector());
|
||||
}
|
||||
|
@ -1495,6 +1502,11 @@ CommandResult Unit::undoCommand(Command *command){
|
|||
}
|
||||
|
||||
void Unit::stopDamageParticles() {
|
||||
|
||||
if(Renderer::getInstance().validateParticleSystemStillExists(fire,rsGame) == false) {
|
||||
fire = NULL;
|
||||
}
|
||||
|
||||
// stop fire
|
||||
if(fire != NULL) {
|
||||
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
||||
|
@ -1525,8 +1537,7 @@ void Unit::startDamageParticles(){
|
|||
}
|
||||
// start fire
|
||||
if(type->getProperty(UnitType::pBurnable) && fire == NULL) {
|
||||
FireParticleSystem *fps;
|
||||
fps= new FireParticleSystem(200);
|
||||
FireParticleSystem *fps = new FireParticleSystem(200);
|
||||
const Game *game = Renderer::getInstance().getGame();
|
||||
fps->setSpeed(2.5f / game->getWorld()->getUpdateFps(this->getFactionIndex()));
|
||||
fps->setPos(getCurrVector());
|
||||
|
|
|
@ -437,6 +437,7 @@ public:
|
|||
void cleanupParticleSystems(vector<ParticleSystem *> &particleSystems);
|
||||
void cleanupUnitParticleSystems(vector<UnitParticleSystem *> &particleSystems);
|
||||
int findParticleSystems(ParticleSystem *psFind, const vector<ParticleSystem *> &particleSystems) const;
|
||||
bool validateParticleSystemStillExists(ParticleSystem * particleSystem) const;
|
||||
};
|
||||
|
||||
}}//end namespace
|
||||
|
|
|
@ -146,7 +146,7 @@ public:
|
|||
}
|
||||
|
||||
std::string getString() const {
|
||||
std::ostringstream streamOut;
|
||||
std::ostringstream streamOut(std::ostringstream::out);
|
||||
streamOut << "x [" << x << "] y [" << y << "]";
|
||||
return streamOut.str();
|
||||
}
|
||||
|
@ -330,7 +330,7 @@ public:
|
|||
}
|
||||
|
||||
std::string getString() const {
|
||||
std::ostringstream streamOut;
|
||||
std::ostringstream streamOut(std::ostringstream::out);
|
||||
streamOut << "x [" << x << "] y [" << y << "] z [" << z << "]";
|
||||
return streamOut.str();
|
||||
}
|
||||
|
@ -473,7 +473,7 @@ public:
|
|||
}
|
||||
|
||||
std::string getString() const {
|
||||
std::ostringstream streamOut;
|
||||
std::ostringstream streamOut(std::ostringstream::out);
|
||||
streamOut << "x [" << x << "] y [" << y << "] z [" << z << "] w [" << w << "]";
|
||||
return streamOut.str();
|
||||
}
|
||||
|
|
|
@ -45,8 +45,13 @@ namespace Shared{ namespace Platform{
|
|||
// =====================================================
|
||||
|
||||
class PlatformContextGl {
|
||||
protected:
|
||||
SDL_Surface *icon;
|
||||
SDL_Surface *screen;
|
||||
|
||||
public:
|
||||
virtual ~PlatformContextGl() {}
|
||||
PlatformContextGl();
|
||||
virtual ~PlatformContextGl();
|
||||
|
||||
virtual void init(int colorBits, int depthBits, int stencilBits,bool hardware_acceleration, bool fullscreen_anti_aliasing);
|
||||
virtual void end();
|
||||
|
|
|
@ -21,9 +21,9 @@
|
|||
std::cerr << "Couldn't initialize SDL: " << SDL_GetError() << "\n"; \
|
||||
return 1; \
|
||||
} \
|
||||
atexit(SDL_Quit); \
|
||||
SDL_EnableUNICODE(1); \
|
||||
int result = X(argc, argv); \
|
||||
SDL_Quit(); \
|
||||
return result; \
|
||||
}
|
||||
|
||||
|
|
|
@ -209,6 +209,9 @@ Pixmap2D* JPGReader::read(ifstream& is, const string& path, Pixmap2D* ret) const
|
|||
jpeg_finish_decompress( &cinfo );
|
||||
jpeg_destroy_decompress( &cinfo );
|
||||
delete[] row_pointer[0];
|
||||
|
||||
delete[] buffer;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
@ -947,6 +947,11 @@ void ParticleManager::update(int renderFps) {
|
|||
if(chrono.getMillis() > 0) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s] Line: %d took msecs: %lld, particleSystemCount = %d, particleCount = %d\n",__FILE__,__FUNCTION__,__LINE__,chrono.getMillis(),particleSystemCount,particleCount);
|
||||
}
|
||||
|
||||
bool ParticleManager::validateParticleSystemStillExists(ParticleSystem * particleSystem) const {
|
||||
int index = findParticleSystems(particleSystem, this->particleSystems);
|
||||
return (index >= 0);
|
||||
}
|
||||
|
||||
int ParticleManager::findParticleSystems(ParticleSystem *psFind, const vector<ParticleSystem *> &particleSystems) const {
|
||||
int result = -1;
|
||||
for (int i = 0; i < particleSystems.size(); i++) {
|
||||
|
|
|
@ -662,11 +662,14 @@ std::vector<std::string> Socket::getLocalIPAddressList() {
|
|||
strncpy(ifrA.ifr_name, szBuf, maxIfNameLength);
|
||||
ifrA.ifr_name[maxIfNameLength] = '\0';
|
||||
|
||||
ioctl(fd, SIOCGIFADDR, &ifr);
|
||||
int result_ifaddrr = ioctl(fd, SIOCGIFADDR, &ifr);
|
||||
ioctl(fd, SIOCGIFFLAGS, &ifrA);
|
||||
close(fd);
|
||||
|
||||
sprintf(myhostaddr, "%s",inet_ntoa(((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr));
|
||||
if(result_ifaddrr >= 0) {
|
||||
struct sockaddr_in *pSockAddr = (struct sockaddr_in *)&ifr.ifr_addr;
|
||||
if(pSockAddr != NULL) {
|
||||
sprintf(myhostaddr, "%s",inet_ntoa(pSockAddr->sin_addr));
|
||||
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] szBuf [%s], myhostaddr = [%s], ifr.ifr_flags = %d, ifrA.ifr_flags = %d, ifr.ifr_name [%s]\n",__FILE__,__FUNCTION__,__LINE__,szBuf,myhostaddr,ifr.ifr_flags,ifrA.ifr_flags,ifr.ifr_name);
|
||||
|
||||
// Now only include interfaces that are both UP and running
|
||||
|
@ -682,6 +685,8 @@ std::vector<std::string> Socket::getLocalIPAddressList() {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
@ -34,6 +34,21 @@ namespace Shared{ namespace Platform{
|
|||
// ======================================
|
||||
// class PlatformContextGl
|
||||
// ======================================
|
||||
PlatformContextGl::PlatformContextGl() {
|
||||
icon = NULL;
|
||||
screen = NULL;
|
||||
}
|
||||
|
||||
PlatformContextGl::~PlatformContextGl() {
|
||||
if(icon != NULL) {
|
||||
SDL_FreeSurface(icon);
|
||||
icon = NULL;
|
||||
}
|
||||
if(screen != NULL) {
|
||||
SDL_FreeSurface(screen);
|
||||
screen = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
void PlatformContextGl::init(int colorBits, int depthBits, int stencilBits,bool hardware_acceleration, bool fullscreen_anti_aliasing) {
|
||||
|
||||
|
@ -59,7 +74,13 @@ void PlatformContextGl::init(int colorBits, int depthBits, int stencilBits,bool
|
|||
|
||||
#ifndef WIN32
|
||||
if(fileExists("megaglest.bmp")) {
|
||||
SDL_Surface *icon = SDL_LoadBMP("megaglest.bmp");
|
||||
|
||||
if(icon != NULL) {
|
||||
SDL_FreeSurface(icon);
|
||||
icon = NULL;
|
||||
}
|
||||
|
||||
icon = SDL_LoadBMP("megaglest.bmp");
|
||||
//SDL_Surface *icon = IMG_Load("megaglest.ico");
|
||||
|
||||
|
||||
|
@ -84,7 +105,12 @@ void PlatformContextGl::init(int colorBits, int depthBits, int stencilBits,bool
|
|||
|
||||
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] about to set resolution: %d x %d, colorBits = %d.\n",__FILE__,__FUNCTION__,__LINE__,resW,resH,colorBits);
|
||||
|
||||
SDL_Surface* screen = SDL_SetVideoMode(resW, resH, colorBits, flags);
|
||||
if(screen != NULL) {
|
||||
SDL_FreeSurface(screen);
|
||||
screen = NULL;
|
||||
}
|
||||
|
||||
screen = SDL_SetVideoMode(resW, resH, colorBits, flags);
|
||||
if(screen == 0) {
|
||||
std::ostringstream msg;
|
||||
msg << "Couldn't set video mode "
|
||||
|
|
Loading…
Reference in New Issue