OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- copied some 3D floor fixes from GZDoom.

Browse source 
- fixed: Crushing polyobject did incomplete checks for blocked moves.


SVN r1355 (trunk)
This commit is contained in:
Christoph Oelckers 2009-01-07 18:45:39 +00:00
commit 35cc39f094
6 changed files with 108 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/d_main.cpp
View file

@ -1562,7 +1562,20 @@ static EIWADType ScanIWAD (const char *iwad)
}
else if (lumpsfound[Check_map01])
{
if (lumpsfound[Check_redtnt2])
if (lumpsfound[Check_FreeDoom])
{
// Is there a 100% reliable way to tell FreeDoom and FreeDM
// apart based solely on the lump names?
if (strstr(iwad, "freedm.wad") || strstr(iwad, "FREEDM.WAD"))
{
return IWAD_FreeDM;
}
else
{
return IWAD_FreeDoom;
}
}
else if (lumpsfound[Check_redtnt2])
{
return IWAD_Doom2TNT;
}
@ -1583,19 +1596,6 @@ static EIWADType ScanIWAD (const char *iwad)
return IWAD_HexenDemo;
}
}
else if (lumpsfound[Check_FreeDoom])
{
// Is there a 100% reliable way to tell FreeDoom and FreeDM
// apart based solely on the lump names?
if (strstr(iwad, "freedm.wad") || strstr(iwad, "FREEDM.WAD"))
{
return IWAD_FreeDM;
}
else
{
return IWAD_FreeDoom;
}
}
else
{
return IWAD_Doom2;