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

issue #119

This commit is contained in:
Ming 2010-09-03 03:10:32 +00:00
parent 9258d171aa
commit 5ee84cb4d4
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test_uphone/tests/ActionManagerTest/ActionManagerTest.cpp
View File

@ -314,7 +314,7 @@ void ResumeTest::onEnter()
this->schedule(schedule_selector(ResumeTest::resumeGrossini), 3.0f); this->schedule(schedule_selector(ResumeTest::resumeGrossini), 3.0f);
} }
void ResumeTest::resumeGrossini() void ResumeTest::resumeGrossini(ccTime time)
{ {
this->unschedule(schedule_selector(ResumeTest::resumeGrossini)); this->unschedule(schedule_selector(ResumeTest::resumeGrossini));

2
test_uphone/tests/ActionManagerTest/ActionManagerTest.h
View File

@ -59,7 +59,7 @@ class ResumeTest : public ActionManagerTest
public: public:
virtual std::string title(); virtual std::string title();
virtual void onEnter(); virtual void onEnter();
void resumeGrossini(); void resumeGrossini(ccTime time);
}; };
class ActionManagerTestScene : public TestScene class ActionManagerTestScene : public TestScene

4
test_uphone/tests/ActionsTest/ActionsTest.cpp
View File

@ -599,7 +599,7 @@ void ActionSequence2::callback1()
addChild(label); addChild(label);
} }
void ActionSequence2::callback2(NSObject* sender) void ActionSequence2::callback2(CCNode* sender)
{ {
CGSize s = CCDirector::getSharedDirector()->getWinSize(); CGSize s = CCDirector::getSharedDirector()->getWinSize();
CCLabel *label = CCLabel::labelWithString("callback 2 called", "Marker Felt", 16); CCLabel *label = CCLabel::labelWithString("callback 2 called", "Marker Felt", 16);
@ -608,7 +608,7 @@ void ActionSequence2::callback2(NSObject* sender)
addChild(label); addChild(label);
} }
void ActionSequence2::callback3(NSObject* sender, void* data) void ActionSequence2::callback3(CCNode* sender, void* data)
{ {
CGSize s = CCDirector::getSharedDirector()->getWinSize(); CGSize s = CCDirector::getSharedDirector()->getWinSize();
CCLabel *label = CCLabel::labelWithString("callback 3 called", "Marker Felt", 16); CCLabel *label = CCLabel::labelWithString("callback 3 called", "Marker Felt", 16);

4
test_uphone/tests/ActionsTest/ActionsTest.h
View File

@ -147,8 +147,8 @@ public:
virtual std::string subtitle(); virtual std::string subtitle();
void callback1(); void callback1();
void callback2(NSObject* sender); void callback2(CCNode* sender);
void callback3(NSObject* sender, void* data); void callback3(CCNode* sender, void* data);
}; };
class ActionSpawn : public ActionsDemo class ActionSpawn : public ActionsDemo

2
test_uphone/tests/TileMapTest/TileMapTest.cpp
View File

@ -352,7 +352,7 @@ TMXReadWriteTest::TMXReadWriteTest()
m_gid2 = 0; m_gid2 = 0;
} }
void TMXReadWriteTest::removeSprite(NSObject* sender) void TMXReadWriteTest::removeSprite(CCNode* sender)
{ {
////----UXLOG("removing tile: %x", sender); ////----UXLOG("removing tile: %x", sender);
CCNode* p = ((CCNode*)sender)->getParent(); CCNode* p = ((CCNode*)sender)->getParent();

2
test_uphone/tests/TileMapTest/TileMapTest.h
View File

@ -84,7 +84,7 @@ public:
TMXReadWriteTest(void); TMXReadWriteTest(void);
virtual std::string title(); virtual std::string title();
void removeSprite(NSObject* sender); void removeSprite(CCNode* sender);
void updateCol(ccTime dt); void updateCol(ccTime dt);
void repaintWithGID(ccTime dt); void repaintWithGID(ccTime dt);
void removeTiles(ccTime dt); void removeTiles(ccTime dt);