zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-27 09:20:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

gameexec.c: refactor 'starttrack' for proper bound checking.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3490 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-02-16 18:53:18 +00:00
parent a3b3804a08
commit 801662c3e7
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
polymer/eduke32/source/gameexec.c
View file

@ -987,6 +987,24 @@ void G_GetTimeDate(int32_t *vals)
vals[7] = ti->tm_yday; vals[7] = ti->tm_yday;
} }
int32_t G_StartTrack(int32_t level)
{
if ((unsigned)level < MAXLEVELS)
{
int32_t musicIndex = MAXLEVELS*ud.volume_number + level;
if (MapInfo[g_musicIndex].musicfn != NULL)
{
g_musicIndex = musicIndex;
S_PlayMusic(MapInfo[g_musicIndex].musicfn, g_musicIndex);
return 0;
}
}
return 1;
}
#if !defined LUNATIC #if !defined LUNATIC
GAMEEXEC_STATIC void VM_Execute(int32_t loop) GAMEEXEC_STATIC void VM_Execute(int32_t loop)
{ {
@ -4618,14 +4636,14 @@ nullquote:
case CON_STARTTRACK: case CON_STARTTRACK:
case CON_STARTTRACKVAR: case CON_STARTTRACKVAR:
insptr++; insptr++;
if (tw == CON_STARTTRACK) g_musicIndex=(ud.volume_number*MAXLEVELS)+(*(insptr++));
else g_musicIndex=(ud.volume_number*MAXLEVELS)+(Gv_GetVarX(*(insptr++)));
if (MapInfo[g_musicIndex].musicfn == NULL)
{ {
CON_ERRPRINTF("null music for map %d\n", g_musicIndex); int32_t level = (tw == CON_STARTTRACK) ? *(insptr++) :
continue; Gv_GetVarX(*(insptr++));
if (G_StartTrack(level))
CON_ERRPRINTF("invalid level %d or null music for volume %d level %d\n",
level, ud.volume_number, level);
} }
S_PlayMusic(&MapInfo[g_musicIndex].musicfn[0],g_musicIndex);
continue; continue;
case CON_ACTIVATECHEAT: case CON_ACTIVATECHEAT: