OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- moved a few more files and copied the data related parts of p_things.cpp to g_doomedmap.cpp

Browse source
This commit is contained in:
Christoph Oelckers 2019-02-01 19:48:17 +01:00
commit 32e5be83ea
16 changed files with 182 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/p_conversation.cpp
View file

@ -97,7 +97,6 @@ struct TeaserSpeech
static FRandom pr_randomspeech("RandomSpeech");
FClassMap StrifeTypes;
static int ConversationMenuY;
// These two should be moved to player_t...
@ -121,16 +120,6 @@ static void TerminalResponse (const char *str);
//
//============================================================================
void SetStrifeType(int convid, PClassActor *Class)
{
StrifeTypes[convid] = Class;
}
void ClearStrifeTypes()
{
StrifeTypes.Clear();
}
void FLevelLocals::SetConversation(int convid, PClassActor *Class, int dlgindex)
{
if (convid != -1)