zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Null pointer checks for music filenames

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@389 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-12-06 23:14:49 +00:00
parent bee93c60b7
commit c45445f8aa
6 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
polymer/eduke32/source/game.c
View file

@ -7853,15 +7853,18 @@ void nonsharedkeys(void)
{ {
if (i == 5 && ps[myconnectindex].fta > 0 && ps[myconnectindex].ftq == 26) if (i == 5 && ps[myconnectindex].fta > 0 && ps[myconnectindex].ftq == 26)
{ {
i = (VOLUMEALL?num_volumes*MAXLEVELS:6); i = (VOLUMEALL?MAXVOLUMES*MAXLEVELS:6);
music_select++; music_select++;
while ((music_fn[0][(unsigned char)music_select] == NULL) && music_select < i) while ((music_fn[0][(unsigned char)music_select] == NULL) && music_select < i)
music_select++; music_select++;
if (music_select == i) if (music_select == i)
music_select = 0; music_select = 0;
Bsprintf(fta_quotes[26],"PLAYING %s",&music_fn[0][(unsigned char)music_select][0]); if (music_fn[0][(unsigned char)music_select] != NULL)
FTA(26,&ps[myconnectindex]); {
playmusic(&music_fn[0][(unsigned char)music_select][0]); Bsprintf(fta_quotes[26],"PLAYING %s",&music_fn[0][(unsigned char)music_select][0]);
FTA(26,&ps[myconnectindex]);
playmusic(&music_fn[0][(unsigned char)music_select][0]);
}
return; return;
} }
@ -8077,7 +8080,9 @@ FAKE_F3:
if (KB_KeyPressed(sc_F5) && MusicDevice >= 0) if (KB_KeyPressed(sc_F5) && MusicDevice >= 0)
{ {
KB_ClearKeyDown(sc_F5); KB_ClearKeyDown(sc_F5);
Bstrcpy(fta_quotes[26],&music_fn[0][(unsigned char)music_select][0]); if (music_fn[0][(unsigned char)music_select] != NULL)
Bstrcpy(fta_quotes[26],&music_fn[0][(unsigned char)music_select][0]);
else fta_quotes[26][0] = '\0';
Bstrcat(fta_quotes[26],". USE SHIFT-F5 TO CHANGE."); Bstrcat(fta_quotes[26],". USE SHIFT-F5 TO CHANGE.");
FTA(26,&ps[myconnectindex]); FTA(26,&ps[myconnectindex]);
} }

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

@ -4400,7 +4400,7 @@ SKIPJIBS:
break; break;
} }
if (levnume > MAXLEVELS-1 || levnume <0) if (levnume > MAXLEVELS-1 || levnume < 0)
{ {
/* /*
if(g_cmddebug&CMDDEBUG_COMPILE) if(g_cmddebug&CMDDEBUG_COMPILE)
@ -6532,7 +6532,8 @@ good:
{ {
insptr++; insptr++;
music_select=*insptr++; music_select=*insptr++;
playmusic(&music_fn[ud.volume_number][(unsigned char)music_select][0]); if (music_fn[ud.volume_number][(unsigned char)music_select] != NULL)
playmusic(&music_fn[ud.volume_number][(unsigned char)music_select][0]);
break; break;
} }

5
polymer/eduke32/source/menus.c
View file

@ -3974,7 +3974,10 @@ cheat_for_port_credits:
else else
{ {
if (ud.recstat != 2 && ps[myconnectindex].gm&MODE_GAME) if (ud.recstat != 2 && ps[myconnectindex].gm&MODE_GAME)
playmusic(&music_fn[0][(unsigned char)music_select][0]); {
if (music_fn[0][(unsigned char)music_select] != NULL)
playmusic(&music_fn[0][(unsigned char)music_select][0]);
}
else playmusic(&env_music_fn[0][0]); else playmusic(&env_music_fn[0][0]);
MUSIC_Continue(); MUSIC_Continue();

3
polymer/eduke32/source/premap.c
View file

@ -1750,7 +1750,8 @@ int enterlevel(char g)
if (ud.recstat != 2) if (ud.recstat != 2)
{ {
music_select = (ud.volume_number*MAXLEVELS) + ud.level_number; music_select = (ud.volume_number*MAXLEVELS) + ud.level_number;
playmusic(&music_fn[0][(unsigned char)music_select][0]); if (music_fn[0][(unsigned char)music_select] != NULL)
playmusic(&music_fn[0][(unsigned char)music_select][0]);
} }
if ((g&MODE_GAME) || (g&MODE_EOL)) if ((g&MODE_GAME) || (g&MODE_EOL))

3
polymer/eduke32/source/savegame.c
View file

@ -354,7 +354,8 @@ int loadplayer(signed char spot)
cacheit(); cacheit();
music_select = (ud.volume_number*MAXLEVELS) + ud.level_number; music_select = (ud.volume_number*MAXLEVELS) + ud.level_number;
playmusic(&music_fn[0][(unsigned char)music_select][0]); if (music_fn[0][(unsigned char)music_select] != NULL)
playmusic(&music_fn[0][(unsigned char)music_select][0]);
ps[myconnectindex].gm = MODE_GAME; ps[myconnectindex].gm = MODE_GAME;
ud.recstat = 0; ud.recstat = 0;

4
polymer/eduke32/source/sounds.c
View file

@ -208,6 +208,8 @@ void playmusic(char *fn)
short fp; short fp;
long l; long l;
if (fn == NULL) return;
if (MusicToggle == 0) return; if (MusicToggle == 0) return;
if (MusicDevice < 0) return; if (MusicDevice < 0) return;
@ -228,6 +230,8 @@ void playmusic(char *fn)
#else #else
void PlayMusic(char *_filename); void PlayMusic(char *_filename);
if (fn == NULL) return;
if(MusicToggle == 0) return; if(MusicToggle == 0) return;
if(MusicDevice < 0) return; if(MusicDevice < 0) return;