OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: The map name display on the automap was incomplete.

Browse source 
- 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:
Christoph Oelckers 2009-02-23 21:55:36 +00:00
commit f188577bb5
4 changed files with 30 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/p_conversation.cpp
View file

@ -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;