zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-17 01:31:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

- print proper information about non-actor mapthings.

Browse source
This commit is contained in:
Christoph Oelckers 2015-04-03 22:23:42 +02:00
parent 9e5bf38123
commit 4f7ec3ad89
4 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/g_doomedmap.cpp
View file

@ -113,8 +113,19 @@ CCMD (dumpmapthings)
for (unsigned i = 0; i < infos.Size (); ++i) for (unsigned i = 0; i < infos.Size (); ++i)
{ {
Printf ("%6d %s\n", if (infos[i]->Value.Type != NULL)
infos[i]->Key, infos[i]->Value.Type->TypeName.GetChars()); {
Printf("%6d %s\n", infos[i]->Key, infos[i]->Value.Type->TypeName.GetChars());
}
else if (infos[i]->Value.Special > 0)
{
Printf("%6d %s\n", infos[i]->Key, SpecialMapthingNames[infos[i]->Value.Special - 1]);
}
else
{
Printf("%6d none", infos[i]->Key);
}
} }
} }
} }

1
src/gi.cpp
View file

@ -335,7 +335,6 @@ void FMapInfoParser::ParseGameInfo()
GAMEINFOKEY_INT(defaultrespawntime, "defaultrespawntime") GAMEINFOKEY_INT(defaultrespawntime, "defaultrespawntime")
GAMEINFOKEY_INT(defaultdropstyle, "defaultdropstyle") GAMEINFOKEY_INT(defaultdropstyle, "defaultdropstyle")
GAMEINFOKEY_STRING(Endoom, "endoom") GAMEINFOKEY_STRING(Endoom, "endoom")
GAMEINFOKEY_INT(player5start, "player5start")
GAMEINFOKEY_STRINGARRAY(quitmessages, "addquitmessages", 0, false) GAMEINFOKEY_STRINGARRAY(quitmessages, "addquitmessages", 0, false)
GAMEINFOKEY_STRINGARRAY(quitmessages, "quitmessages", 0, true) GAMEINFOKEY_STRINGARRAY(quitmessages, "quitmessages", 0, true)
GAMEINFOKEY_STRING(mTitleColor, "menufontcolor_title") GAMEINFOKEY_STRING(mTitleColor, "menufontcolor_title")

1
src/gi.h
View file

@ -153,7 +153,6 @@ struct gameinfo_t
int definventorymaxamount; int definventorymaxamount;
int defaultrespawntime; int defaultrespawntime;
int defaultdropstyle; int defaultdropstyle;
int player5start;
DWORD pickupcolor; DWORD pickupcolor;
TArray<FString> quitmessages; TArray<FString> quitmessages;
FName mTitleColor; FName mTitleColor;

2
src/p_buildmap.cpp
View file

@ -723,7 +723,7 @@ static int LoadSprites (spritetype *sprites, Xsprite *xsprites, int numsprites,
if (xsprites[i].Data1 < 4) if (xsprites[i].Data1 < 4)
mapthings[count].type = 1 + xsprites[i].Data1; mapthings[count].type = 1 + xsprites[i].Data1;
else else
mapthings[count].type = gameinfo.player5start + xsprites[i].Data1 - 4; mapthings[count].type = 4001 + xsprites[i].Data1 - 4;
} }
else if (xsprites != NULL && sprites[i].lotag == 2) else if (xsprites != NULL && sprites[i].lotag == 2)
{ // Bloodbath start { // Bloodbath start