- 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:
parent
b37d0ba2ea
commit
4d5692bf80
10 changed files with 140 additions and 48 deletions
|
|
@ -145,16 +145,19 @@ inline bool FWadFile::IsMarker(int lump, const char *marker)
|
|||
//
|
||||
//==========================================================================
|
||||
|
||||
// This class was supposed to be local in the function but GCC
|
||||
// does not like that.
|
||||
struct Marker
|
||||
{
|
||||
int markertype;
|
||||
int index;
|
||||
};
|
||||
|
||||
void FWadFile::SetNamespace(const char *startmarker, const char *endmarker, namespace_t space, bool flathack)
|
||||
{
|
||||
bool warned = false;
|
||||
int numstartmarkers = 0, numendmarkers = 0;
|
||||
int i;
|
||||
struct Marker
|
||||
{
|
||||
int markertype;
|
||||
int index;
|
||||
};
|
||||
TArray<Marker> markers;
|
||||
|
||||
for(i = 0; i < (int)NumLumps; i++)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue