TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Swap order of Mac sound tests

Browse source 
Simplify the code by removing a now-redundant array test.
This commit is contained in:
Kp 2015-01-17 18:31:41 +00:00
parent eb09eb4396
commit 5b48c184af
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
similar/main/piggy.cpp
View file

@ -1198,12 +1198,7 @@ void piggy_read_sounds(int pc_shareware)
char soundfile[32] = "Sounds/sounds.array";
PHYSFS_file *array = PHYSFSX_openReadBuffered(soundfile); // hack for Mac Demo
if (!array && (PHYSFSX_fsize(DEFAULT_PIGFILE_REGISTERED) == D1_MAC_SHARE_PIGSIZE))
{
con_printf(CON_URGENT,"Warning: Missing Sounds/sounds.array for Mac data files");
return;
}
else if (array)
if (array)
{
if (PHYSFS_read(array, Sounds, MAX_SOUNDS, 1) != 1) // make the 'Sounds' index array match with the sounds we're about to read in
{
@ -1213,6 +1208,11 @@ void piggy_read_sounds(int pc_shareware)
}
PHYSFS_close(array);
}
else if (PHYSFSX_fsize(DEFAULT_PIGFILE_REGISTERED) == D1_MAC_SHARE_PIGSIZE)
{
con_printf(CON_URGENT,"Warning: Missing Sounds/sounds.array for Mac data files");
return;
}
for (i = 0; i < MAX_SOUND_FILES; i++)
{