mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-27 22:33:17 +00:00
Merge branch 'master' of https://github.com/rheit/zdoom
This commit is contained in:
commit
49e0eb03cc
2 changed files with 6 additions and 5 deletions
|
@ -79,7 +79,7 @@ struct FMapInfoParser
|
||||||
|
|
||||||
bool ParseLookupName(FString &dest);
|
bool ParseLookupName(FString &dest);
|
||||||
void ParseMusic(FString &name, int &order);
|
void ParseMusic(FString &name, int &order);
|
||||||
void ParseLumpOrTextureName(char *name);
|
//void ParseLumpOrTextureName(char *name);
|
||||||
void ParseLumpOrTextureName(FString &name);
|
void ParseLumpOrTextureName(FString &name);
|
||||||
|
|
||||||
void ParseCluster();
|
void ParseCluster();
|
||||||
|
|
|
@ -622,12 +622,14 @@ bool FMapInfoParser::ParseLookupName(FString &dest)
|
||||||
//
|
//
|
||||||
//==========================================================================
|
//==========================================================================
|
||||||
|
|
||||||
|
/*
|
||||||
void FMapInfoParser::ParseLumpOrTextureName(char *name)
|
void FMapInfoParser::ParseLumpOrTextureName(char *name)
|
||||||
{
|
{
|
||||||
sc.MustGetString();
|
sc.MustGetString();
|
||||||
uppercopy(name, sc.String);
|
uppercopy(name, sc.String);
|
||||||
name[8]=0;
|
name[8]=0;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
void FMapInfoParser::ParseLumpOrTextureName(FString &name)
|
void FMapInfoParser::ParseLumpOrTextureName(FString &name)
|
||||||
{
|
{
|
||||||
|
@ -1572,7 +1574,7 @@ level_info_t *FMapInfoParser::ParseMapHeader(level_info_t &defaultinfo)
|
||||||
void FMapInfoParser::ParseEpisodeInfo ()
|
void FMapInfoParser::ParseEpisodeInfo ()
|
||||||
{
|
{
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
char map[9];
|
FString map;
|
||||||
FString pic;
|
FString pic;
|
||||||
FString name;
|
FString name;
|
||||||
bool remove = false;
|
bool remove = false;
|
||||||
|
@ -1583,15 +1585,14 @@ void FMapInfoParser::ParseEpisodeInfo ()
|
||||||
|
|
||||||
// Get map name
|
// Get map name
|
||||||
sc.MustGetString ();
|
sc.MustGetString ();
|
||||||
uppercopy (map, sc.String);
|
map = sc.String;
|
||||||
map[8] = 0;
|
|
||||||
|
|
||||||
if (sc.CheckString ("teaser"))
|
if (sc.CheckString ("teaser"))
|
||||||
{
|
{
|
||||||
sc.MustGetString ();
|
sc.MustGetString ();
|
||||||
if (gameinfo.flags & GI_SHAREWARE)
|
if (gameinfo.flags & GI_SHAREWARE)
|
||||||
{
|
{
|
||||||
uppercopy (map, sc.String);
|
map = sc.String;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue