duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'accurate' into portable

Browse source
This commit is contained in:
Clownacy 2020-01-23 01:37:03 +00:00
commit e8edc42d07
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Organya.cpp
View file

@ -455,7 +455,11 @@ BOOL OrgData::SetMusicInfo(MUSICINFO *mi, unsigned long flag)
for (i = 0; i < MAXMELODY; i++) for (i = 0; i < MAXMELODY; i++)
{ {
info.tdata[i].freq = mi->tdata[i].freq; info.tdata[i].freq = mi->tdata[i].freq;
info.tdata[i].pipi = info.tdata[i].pipi; // info.tdata[i].pipi is assigned to itself. Thanks, Pixel. (Most likely, the original code wasn't written the exact same way) #ifdef FIX_BUGS
info.tdata[i].pipi = mi->tdata[i].pipi;
#else
info.tdata[i].pipi = info.tdata[i].pipi; // Just sets info.tdata[i].pipi to itself
#endif
} }
} }
@ -488,11 +492,11 @@ BOOL OrgData::NoteAlloc(unsigned short alloc)
if (info.tdata[i].note_p != NULL) if (info.tdata[i].note_p != NULL)
{ {
free(info.tdata[i].note_p); free(info.tdata[i].note_p);
#ifdef FIX_BUGS #ifdef FIX_BUGS
info.tdata[i].note_p = NULL; info.tdata[i].note_p = NULL;
#else #else
info.tdata[j].note_p = NULL; // Uses j instead of i info.tdata[j].note_p = NULL; // Uses j instead of i
#endif #endif
} }
} }