Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6580 from ricardoquesada/sprite_new_fixes 

Revert `new Sprite` change done a few days ago
This commit is contained in:
Ricardo Quesada 2014-05-05 16:54:50 -07:00
parent 80ecdc8d2a e413b86295
commit 666e820a2a
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cocos/2d/CCSprite.cpp
View File

@ -61,8 +61,8 @@ NS_CC_BEGIN
Sprite* Sprite::createWithTexture(Texture2D *texture)
{
Sprite *sprite = new Sprite();
if (sprite->initWithTexture(texture))
Sprite *sprite = new (std::nothrow) Sprite();
if (sprite && sprite->initWithTexture(texture))
{
sprite->autorelease();
return sprite;
@ -73,8 +73,8 @@ Sprite* Sprite::createWithTexture(Texture2D *texture)
Sprite* Sprite::createWithTexture(Texture2D *texture, const Rect& rect, bool rotated)
{
Sprite *sprite = new Sprite();
if (sprite->initWithTexture(texture, rect, rotated))
Sprite *sprite = new (std::nothrow) Sprite();
if (sprite && sprite->initWithTexture(texture, rect, rotated))
{
sprite->autorelease();
return sprite;
@ -85,8 +85,8 @@ Sprite* Sprite::createWithTexture(Texture2D *texture, const Rect& rect, bool rot
Sprite* Sprite::create(const std::string& filename)
{
Sprite *sprite = new Sprite();
if (sprite->initWithFile(filename))
Sprite *sprite = new (std::nothrow) Sprite();
if (sprite && sprite->initWithFile(filename))
{
sprite->autorelease();
return sprite;
@ -97,8 +97,8 @@ Sprite* Sprite::create(const std::string& filename)
Sprite* Sprite::create(const std::string& filename, const Rect& rect)
{
Sprite *sprite = new Sprite();
if (sprite->initWithFile(filename, rect))
Sprite *sprite = new (std::nothrow) Sprite();
if (sprite && sprite->initWithFile(filename, rect))
{
sprite->autorelease();
return sprite;
@ -109,8 +109,8 @@ Sprite* Sprite::create(const std::string& filename, const Rect& rect)
Sprite* Sprite::createWithSpriteFrame(SpriteFrame *spriteFrame)
{
Sprite *sprite = new Sprite();
if (spriteFrame && sprite->initWithSpriteFrame(spriteFrame))
Sprite *sprite = new (std::nothrow) Sprite();
if (sprite && spriteFrame && sprite->initWithSpriteFrame(spriteFrame))
{
sprite->autorelease();
return sprite;
@ -134,7 +134,7 @@ Sprite* Sprite::createWithSpriteFrameName(const std::string& spriteFrameName)
Sprite* Sprite::create()
{
Sprite *sprite = new Sprite();
Sprite *sprite = new (std::nothrow) Sprite();
if (sprite && sprite->init())
{
sprite->autorelease();