- fixed: Identification of Doom1 Freedoom IWAD did not work.
- fixed: UDMF did not initialize a sector's light colors. - fixed implementation of DF2_NOAUTOAIM flag. SVN r1356 (trunk)
This commit is contained in:
parent
35cc39f094
commit
b4b76ed4e6
11 changed files with 57 additions and 70 deletions
|
|
@ -479,19 +479,6 @@ CUSTOM_CVAR (Int, dmflags2, 0, CVAR_SERVERINFO)
|
|||
if (p->cheats & CF_CHASECAM)
|
||||
cht_DoCheat (p, CHT_CHASECAM);
|
||||
}
|
||||
|
||||
// Change our autoaim settings if need be.
|
||||
if (dmflags2 & DF2_NOAUTOAIM)
|
||||
{
|
||||
// Save our aimdist and set aimdist to 0.
|
||||
p->userinfo.savedaimdist = p->userinfo.aimdist;
|
||||
p->userinfo.aimdist = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Restore our aimdist.
|
||||
p->userinfo.aimdist = p->userinfo.savedaimdist;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1634,18 +1621,15 @@ static EIWADType ScanIWAD (const char *iwad)
|
|||
}
|
||||
else
|
||||
{
|
||||
if (lumpsfound[Check_FreeDoom])
|
||||
{
|
||||
return IWAD_FreeDoom1;
|
||||
}
|
||||
for (i = Check_e2m1; i < NUM_CHECKLUMPS; i++)
|
||||
{
|
||||
if (!lumpsfound[i])
|
||||
{
|
||||
if (lumpsfound[Check_FreeDoom])
|
||||
{
|
||||
return IWAD_FreeDoom1;
|
||||
}
|
||||
else
|
||||
{
|
||||
return IWAD_DoomShareware;
|
||||
}
|
||||
return IWAD_DoomShareware;
|
||||
}
|
||||
}
|
||||
if (i == NUM_CHECKLUMPS)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue