mirror of
https://github.com/love2d/love.git
synced 2026-08-16 00:02:12 +02:00
final merge before pushing back into the main branch
This commit is contained in:
@@ -37,6 +37,7 @@ namespace opengl
|
||||
// created yet.
|
||||
currentMode.width = 0;
|
||||
currentMode.height = 0;
|
||||
currentMode.fullscreen = 0;
|
||||
|
||||
// Window should be centered.
|
||||
SDL_putenv(const_cast<char *>("SDL_VIDEO_CENTERED=center"));
|
||||
|
||||
@@ -62,10 +62,7 @@ namespace opengl
|
||||
ParticleSystem::~ParticleSystem()
|
||||
{
|
||||
if(this->sprite != 0)
|
||||
{
|
||||
this->sprite->release();
|
||||
this->sprite = 0;
|
||||
}
|
||||
|
||||
if(pStart != 0)
|
||||
delete [] pStart;
|
||||
@@ -138,13 +135,11 @@ namespace opengl
|
||||
|
||||
void ParticleSystem::setSprite(Image * image)
|
||||
{
|
||||
if(this->sprite != 0)
|
||||
{
|
||||
this->sprite->release();
|
||||
this->sprite = 0;
|
||||
}
|
||||
if(sprite != 0)
|
||||
sprite->release();
|
||||
|
||||
this->sprite = image;
|
||||
sprite = image;
|
||||
sprite->retain();
|
||||
}
|
||||
|
||||
void ParticleSystem::setBufferSize(unsigned int size)
|
||||
|
||||
Reference in New Issue
Block a user