zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-24 13:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2014-09-08 13:02:39 +02:00
commit 3d2646cbae
3 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_level.h
View file

@ -525,7 +525,7 @@ level_info_t *CheckLevelRedirect (level_info_t *info);
FString CalcMapName (int episode, int level); FString CalcMapName (int episode, int level);
void G_ParseMapInfo (const char *basemapinfo); void G_ParseMapInfo (FString basemapinfo);
void G_ClearSnapshots (void); void G_ClearSnapshots (void);
void P_RemoveDefereds (); void P_RemoveDefereds ();

6
src/g_mapinfo.cpp
View file

@ -1886,7 +1886,7 @@ static void ClearMapinfo()
// //
//========================================================================== //==========================================================================
void G_ParseMapInfo (const char *basemapinfo) void G_ParseMapInfo (FString basemapinfo)
{ {
int lump, lastlump = 0; int lump, lastlump = 0;
level_info_t gamedefaults; level_info_t gamedefaults;
@ -1895,7 +1895,7 @@ void G_ParseMapInfo (const char *basemapinfo)
atterm(ClearMapinfo); atterm(ClearMapinfo);
// Parse the default MAPINFO for the current game. This lump *MUST* come from zdoom.pk3. // Parse the default MAPINFO for the current game. This lump *MUST* come from zdoom.pk3.
if (basemapinfo != NULL) if (basemapinfo.IsNotEmpty())
{ {
FMapInfoParser parse; FMapInfoParser parse;
level_info_t defaultinfo; level_info_t defaultinfo;
@ -1903,7 +1903,7 @@ void G_ParseMapInfo (const char *basemapinfo)
if (Wads.GetLumpFile(baselump) > 0) if (Wads.GetLumpFile(baselump) > 0)
{ {
I_FatalError("File %s is overriding core lump %s.", I_FatalError("File %s is overriding core lump %s.",
Wads.GetWadFullName(Wads.GetLumpFile(baselump)), basemapinfo); Wads.GetWadFullName(Wads.GetLumpFile(baselump)), basemapinfo.GetChars());
} }
parse.ParseMapInfo(baselump, gamedefaults, defaultinfo); parse.ParseMapInfo(baselump, gamedefaults, defaultinfo);
} }

19
wadsrc/static/iwadinfo.txt
View file

@ -1,5 +1,23 @@
// Must be sorted in identification order (easiest to recognize first!) // Must be sorted in identification order (easiest to recognize first!)
IWad
{
Name = "The Adventures of Square"
Game = "Doom"
Config = "Square"
MustContain = "SQU-IWAD", "E1A1"
BannerColors = "ff ff ff", "80 00 80"
}
IWad
{
Name = "The Adventures of Square (Square-ware)"
Game = "Doom"
Config = "Square"
MustContain = "SQU-SWE1", "E1A1"
BannerColors = "ff ff ff", "80 00 80"
}
IWad IWad
{ {
Name = "Harmony" Name = "Harmony"
@ -361,4 +379,5 @@ Names
"harm1.wad" "harm1.wad"
"hacx.wad" "hacx.wad"
"hacx2.wad" "hacx2.wad"
"square1.pk3"
} }