mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-25 13:31:37 +00:00
- Fixed: The map name display on the automap was incomplete.
- Added FakeInventory.Respawns DECORATe property - Fixed: Unsetting the MF5_INCONVERSATION flag did not work when quitting the conversation by pressing Escape. SVN r1442 (trunk)
This commit is contained in:
parent
613ae5e022
commit
f188577bb5
4 changed files with 30 additions and 6 deletions
|
@ -1,4 +1,10 @@
|
|||
February 22, 2009 (Changes by Graf Zahl)
|
||||
February 23, 2009 (Changes by Graf Zahl)
|
||||
- Fixed: The map name display on the automap was incomplete.
|
||||
- Added FakeInventory.Respawns DECORATe property
|
||||
- Fixed: Unsetting the MF5_INCONVERSATION flag did not work when quitting the
|
||||
conversation by pressing Escape.
|
||||
|
||||
February 22, 2009 (Changes by Graf Zahl)
|
||||
- added ML_BLOCKPROJECTILE flag to lines.
|
||||
- Fixed: With opl_onechip set the second OPL chip was never set to anything valid
|
||||
so it contained an invalid pointer. There were also a few other places that
|
||||
|
|
|
@ -1237,14 +1237,17 @@ void DBaseStatusBar::Draw (EHudState state)
|
|||
}
|
||||
}
|
||||
cluster_info_t *cluster = FindClusterInfo (level.cluster);
|
||||
i = 0;
|
||||
if (cluster == NULL || !(cluster->flags & CLUSTER_HUB))
|
||||
{
|
||||
i = mysnprintf (line, countof(line), "%s: ", level.mapname);
|
||||
mysnprintf (line, countof(line), "%s: ", level.mapname);
|
||||
}
|
||||
else
|
||||
{
|
||||
*line = 0;
|
||||
}
|
||||
FString mapname;
|
||||
|
||||
mapname.Format("%c%c%s", TEXTCOLOR_ESCAPE, CR_GREY + 'A', level.LevelName.GetChars());
|
||||
mapname.Format("%s%c%c%s", line, TEXTCOLOR_ESCAPE, CR_GREY + 'A', level.LevelName.GetChars());
|
||||
screen->DrawText (SmallFont, highlight,
|
||||
(SCREENWIDTH - SmallFont->StringWidth (mapname)*CleanXfac)/2, y, mapname,
|
||||
DTA_CleanNoMove, true, TAG_DONE);
|
||||
|
|
|
@ -1194,17 +1194,22 @@ void P_ConversationCommand (int player, BYTE **stream)
|
|||
break;
|
||||
|
||||
case CONV_SETNULL:
|
||||
if (players[player].ConversationNPC != NULL)
|
||||
{
|
||||
players[player].ConversationNPC->flags5 &= ~MF5_INCONVERSATION;
|
||||
}
|
||||
players[player].ConversationFaceTalker = false;
|
||||
players[player].ConversationNPC = NULL;
|
||||
players[player].ConversationPC = NULL;
|
||||
players[player].ConversationNPCAngle = 0;
|
||||
// fall through
|
||||
break;
|
||||
|
||||
case CONV_CLOSE:
|
||||
if (players[player].ConversationNPC != NULL)
|
||||
{
|
||||
players[player].ConversationNPC->flags5 &= ~MF5_INCONVERSATION;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
|
|
|
@ -123,6 +123,16 @@ static const char *RenderStyles[] =
|
|||
|
||||
// CODE --------------------------------------------------------------------
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
//==========================================================================
|
||||
DEFINE_CLASS_PROPERTY(respawns, 0, FakeInventory)
|
||||
{
|
||||
defaults->Respawnable = true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
// ParseOldDecoration
|
||||
|
|
Loading…
Reference in a new issue