- Added MF5_CANTSEEK flag to prevent seeker missiles from homing in on
certain actors and added an option to APowerInvisibility to set this flag when active. - Added map specific automap backgrounds. - Fixed: Voodoo dolls did not play a sound when dying. - Added colorized error messages to DECORATE and made a few more error conditions that do not block further parsing not immediately abort. - Made all errors in CreateNewActor not immediately fatal so that the rest of the DECORATE lump can be parsed normally to look for more errors. - Fixed: Defining classes with the same name as their immediate base class was legal. It should not be allowed that a class has another one with the same name in its ancestry. - Fixed: Formatting of the intermission screen on Heretic, Hexen and Strife was broken. Changed it to use WI_Drawpercent which does it properly and also allows showing percentage in these games now. - Fixed: The MAPINFO parser ignored missing terminating braces of the last block in the file. SVN r1425 (trunk)
This commit is contained in:
parent
0acc6a4ee3
commit
666e40c8bb
23 changed files with 474 additions and 345 deletions
|
|
@ -541,6 +541,21 @@ void FMapInfoParser::SkipToNext()
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
// checks if the current block was properly terminated
|
||||
//
|
||||
//==========================================================================
|
||||
|
||||
void FMapInfoParser::CheckEndOfFile(const char *block)
|
||||
{
|
||||
if (format_type == FMT_New && !sc.Compare("}"))
|
||||
{
|
||||
sc.ScriptError("Unexpected end of file in %s definition", block);
|
||||
}
|
||||
}
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
// ParseLookupname
|
||||
|
|
@ -715,6 +730,7 @@ void FMapInfoParser::ParseCluster()
|
|||
break;
|
||||
}
|
||||
}
|
||||
CheckEndOfFile("cluster");
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1191,6 +1207,13 @@ DEFINE_MAP_OPTION(teamdamage, true)
|
|||
info->teamdamage = parse.sc.Float;
|
||||
}
|
||||
|
||||
DEFINE_MAP_OPTION(mapbackground, true)
|
||||
{
|
||||
parse.ParseAssign();
|
||||
parse.ParseLumpOrTextureName(info->mapbg);
|
||||
}
|
||||
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
// All flag based map options
|
||||
|
|
@ -1421,6 +1444,7 @@ void FMapInfoParser::ParseMapDefinition(level_info_t &info)
|
|||
}
|
||||
}
|
||||
}
|
||||
CheckEndOfFile("map");
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1620,6 +1644,7 @@ void FMapInfoParser::ParseEpisodeInfo ()
|
|||
break;
|
||||
}
|
||||
}
|
||||
CheckEndOfFile("episode");
|
||||
|
||||
if (extended && !(gameinfo.flags & GI_MENUHACK_EXTENDED))
|
||||
{ // If the episode is for the extended Heretic, but this is
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue