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

Merge pull request #386 from natural-law/master 

Resolve crash on ios
This commit is contained in:
minggo 2011-07-12 01:02:39 -07:00
parent 58f043a3fb e8ac968b3b
commit bf13472803
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test.ios/test.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
33ad1fd0694c56b7b34f9ebd3e563782e572c270
231d95df880ff006a4a6af1f4330efd2a21b7fc7

2
tests/tests/BugsTest/Bug-350.cpp
View File

@ -10,7 +10,7 @@ bool Bug350Layer::init()
if (BugsTestBaseLayer::init())
{
CCSize size = CCDirector::sharedDirector()->getWinSize();
CCSprite *background = CCSprite::spriteWithFile("Default.png");
CCSprite *background = CCSprite::spriteWithFile("Hello.png");
background->setPosition(ccp(size.width/2, size.height/2));
addChild(background);
return true;

8
tests/tests/TileMapTest/TileMapTest.cpp
View File

@ -1398,7 +1398,7 @@ TMXGIDObjectsTest::TMXGIDObjectsTest()
CCLOG("Contentsize: %f, %f", s.width, s.height);
CCLOG("----> Iterating over all the group objets");
CCTMXObjectGroup *group = map->objectGroupNamed("Object Layer 1");
//CCTMXObjectGroup *group = map->objectGroupNamed("Object Layer 1");
}
@ -1432,9 +1432,9 @@ void TMXGIDObjectsTest::draw()
ccDrawLine(ccp(x, y), ccp(x + width, y));
ccDrawLine(ccp(x + width, y), ccp(x + width, y + height));
ccDrawLine(ccp(x + width,y + height), ccp(x,y + height));
ccDrawLine(ccp(x,y + height), ccp(x,y));
ccDrawLine(ccp(x + width,y + height), ccp(x,y + height));
ccDrawLine(ccp(x,y + height), ccp(x,y));
glLineWidth(1);
}
}