izzy/Diddy-Kong-Racing
0
0
Fork 0
mirror of https://github.com/izzy2lost/Diddy-Kong-Racing.git synced 2026-06-19 01:16:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

Moved some al functions, and some tab to spaces cleanup

Browse Source
This commit is contained in:
Ryan Myers
2021-09-24 11:39:14 -04:00
parent 8cabb35124
commit 2ca8f80c39
3 changed files with 32 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/src/alCopy.c → lib/src/al/alCopy.c
View File
lib/src/unknown_0C9C90.c
+31 -35
View File
@@ -8,27 +8,27 @@
void alEvtqFlushType(ALEventQueue *evtq, s16 type)
{
ALLink *thisNode;
ALLink *nextNode;
ALLink *thisNode;
ALLink *nextNode;
ALEventListItem *thisItem, *nextItem;
OSIntMask mask;
OSIntMask mask;
mask = osSetIntMask(OS_IM_NONE);
thisNode = evtq->allocList.next;
while( thisNode != 0 )
{
nextNode = thisNode->next;
thisItem = (ALEventListItem *)thisNode;
nextItem = (ALEventListItem *)nextNode;
if (thisItem->evt.type == type)
{
if (nextItem)
nextItem->delta += thisItem->delta;
alUnlink(thisNode);
alLink(thisNode, &evtq->freeList);
}
thisNode = nextNode;
nextNode = thisNode->next;
thisItem = (ALEventListItem *)thisNode;
nextItem = (ALEventListItem *)nextNode;
if (thisItem->evt.type == type)
{
if (nextItem)
nextItem->delta += thisItem->delta;
alUnlink(thisNode);
alLink(thisNode, &evtq->freeList);
}
thisNode = nextNode;
}
osSetIntMask(mask);
@@ -44,10 +44,10 @@ void alEvtqFlush(ALEventQueue *evtq)
thisNode = evtq->allocList.next;
while( thisNode != 0 ) {
nextNode = thisNode->next;
alUnlink(thisNode);
alLink(thisNode, &evtq->freeList);
thisNode = nextNode;
nextNode = thisNode->next;
alUnlink(thisNode);
alLink(thisNode, &evtq->freeList);
thisNode = nextNode;
}
osSetIntMask(mask);
@@ -119,22 +119,19 @@ ALMicroTime alEvtqNextEvent(ALEventQueue *evtq, ALEvent *evt) {
item = (ALEventListItem *)evtq->allocList.next;
if (item)
{
if (item) {
alUnlink((ALLink *)item);
alCopy(&item->evt, evt, sizeof(*evt));
alLink((ALLink *)item, &evtq->freeList);
delta = item->delta;
}
else
{
delta = item->delta;
} else {
/* sct 11/28/95 - If we get here, most like we overflowed the event queue */
/* with non-self-perpetuating events. Eg. if we filled the evtq with volume */
/* events, then when the seqp is told to play it will handle all the events */
/* at once completely emptying out the queue. At this point this problem */
/* must be treated as an out of resource error and the evtq should be increased. */
evt->type = -1;
delta = 0;
/* with non-self-perpetuating events. Eg. if we filled the evtq with volume */
/* events, then when the seqp is told to play it will handle all the events */
/* at once completely emptying out the queue. At this point this problem */
/* must be treated as an out of resource error and the evtq should be increased. */
evt->type = -1;
delta = 0;
}
osSetIntMask(mask);
@@ -157,8 +154,7 @@ void alEvtqNew(ALEventQueue *evtq, ALEventListItem *items, s32 itemCount) {
}
}
void alSynAddPlayer(ALSynth *drvr, ALPlayer *client)
{
void alSynAddPlayer(ALSynth *drvr, ALPlayer *client) {
OSIntMask mask = osSetIntMask(OS_IM_NONE);
client->samplesLeft = drvr->curSamples;
@@ -205,8 +201,8 @@ s32 _allocatePVoice(ALSynth *drvr, PVoice **pvoice, s16 priority)
}
#endif
s32 alSynAllocVoice(ALSynth *drvr, ALVoice *voice, ALVoiceConfig *vc)
{
ALParam *__allocParam(void);
s32 alSynAllocVoice(ALSynth *drvr, ALVoice *voice, ALVoiceConfig *vc) {
PVoice *pvoice = 0;
ALFilter *f;
ALParam *update;
@@ -276,4 +272,4 @@ s32 alSynAllocVoice(ALSynth *drvr, ALVoice *voice, ALVoiceConfig *vc)
}
return (pvoice != 0);
}
}
tools/python/generate_ld.py
+1 -1
View File
@@ -21,7 +21,7 @@ DATA_DIR = ROOT_DIR + '/data'
BUILD_DIR = 'build/' + VERSION
LATE_DATA_FILES = [
BUILD_DIR + '/lib/src/alCopy.o',
BUILD_DIR + '/lib/src/al/alCopy.o',
BUILD_DIR + '/lib/src/printf.o',
BUILD_DIR + '/lib/src/os/osTimer.o',
BUILD_DIR + '/lib/src/unknown_0D3020.o'