- Fixed: Doom's fullscreen HUD was limited to 6 keys.

- Made 'next endgame' work again for cases where it is supposed to be
  the same as 'next endgame4'.
- GCC nitpick fix: Classes being used as template parameters may not be
  defined locally in a function. Fixed FWadFile::SetNamespace for that.
- Improved error reporting for incorrect textures in maps.
- Fixed: When music was stopped this was not set in the global music state.
- Fixed: Friendly monsters did not target enemy players in deathmatch.

SVN r1567 (trunk)
This commit is contained in:
Christoph Oelckers 2009-05-02 09:14:01 +00:00
commit 4d5692bf80
10 changed files with 140 additions and 48 deletions

View file

@ -760,15 +760,20 @@ void FMapInfoParser::ParseNextMap(char *mapname)
}
else
{
sc.MustGetString();
sc.MustGetString();
if (sc.Compare("endgame"))
{
if (!sc.CheckString("{"))
{
// Make Demon Eclipse work again
sc.UnGet();
goto standard_endgame;
}
newSeq.Advanced = true;
newSeq.EndType = END_Pic1;
newSeq.PlayTheEnd = false;
newSeq.MusicLooping = true;
sc.MustGetStringName("{");
while (!sc.CheckString("}"))
{
sc.MustGetString();
@ -843,6 +848,7 @@ void FMapInfoParser::ParseNextMap(char *mapname)
case 'C': type = END_Cast; break;
case 'W': type = END_Underwater; break;
case 'S': type = END_Strife; break;
standard_endgame:
default: type = END_Pic3; break;
}
newSeq.EndType = type;