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

issue #26: change malloc/calloc to new

This commit is contained in:
Ming 2010-08-04 03:02:33 +00:00
parent b11c03cff3
commit f236e4d542
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cocos2dx/CCScheduler.cpp
View File

@ -202,7 +202,7 @@ void CCScheduler::scheduleSelector(SEL_SCHEDULE pfnSelector, SelectorProtocol *p
if (! pElement) if (! pElement)
{ {
pElement = (tHashSelectorEntry *)calloc(sizeof(*pElement), 1); pElement = new tHashSelectorEntry;
pElement->target = pTarget; pElement->target = pTarget;
HASH_ADD_INT(m_pHashForSelectors, target, pElement); HASH_ADD_INT(m_pHashForSelectors, target, pElement);
@ -287,7 +287,7 @@ void CCScheduler::unscheduleSelector(SEL_SCHEDULE pfnSelector, SelectorProtocol
void CCScheduler::priorityIn(tListEntry **ppList, SelectorProtocol *pTarget, int nPriority, bool bPaused) void CCScheduler::priorityIn(tListEntry **ppList, SelectorProtocol *pTarget, int nPriority, bool bPaused)
{ {
tListEntry *pListElement = (tListEntry *)malloc(sizeof(*pListElement)); tListEntry *pListElement = new tListEntry;
pListElement->target = pTarget; pListElement->target = pTarget;
pListElement->priority = nPriority; pListElement->priority = nPriority;
@ -332,11 +332,18 @@ void CCScheduler::priorityIn(tListEntry **ppList, SelectorProtocol *pTarget, int
DL_APPEND(*ppList, pListElement); DL_APPEND(*ppList, pListElement);
} }
} }
// update hash entry for quick access
tHashUpdateEntry *pHashElement = new tHashUpdateEntry();
pHashElement->target = pTarget;
pHashElement->list = ppList;
pHashElement->entry = pListElement;
HASH_ADD_INT(m_pHashForUpdates, target, pHashElement);
} }
void CCScheduler::appendIn(_listEntry **ppList, SelectorProtocol *pTarget, bool bPaused) void CCScheduler::appendIn(_listEntry **ppList, SelectorProtocol *pTarget, bool bPaused)
{ {
tListEntry *pListElement = (tListEntry *)malloc(sizeof(*pListElement)); tListEntry *pListElement = new tListEntry;
pListElement->target = pTarget; pListElement->target = pTarget;
pListElement->paused = bPaused; pListElement->paused = bPaused;