OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- implemented subtitle display for Blackbird's voiceover messages.

Browse source
This commit is contained in:
Christoph Oelckers 2019-05-19 12:16:13 +02:00
commit 04334aa0fe
8 changed files with 41 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/p_user.cpp
View file

@ -421,7 +421,7 @@ DEFINE_ACTION_FUNCTION(_PlayerInfo, SetLogNumber)
void player_t::SetLogText (const char *text)
{
LogText = text;
LogText = text;
if (mo && mo->CheckLocalView())
{
@ -438,6 +438,30 @@ DEFINE_ACTION_FUNCTION(_PlayerInfo, SetLogText)
return 0;
}
void player_t::SetSubtitle(int num)
{
char lumpname[36];
// Do we have a subtitle for this log entry's voice file?
mysnprintf(lumpname, countof(lumpname), "$TXT_SUB_LOG%d", num);
auto text = GStrings.GetLanguageString(lumpname+1, FStringTable::default_table);
if (text != nullptr)
{
SubtitleText = lumpname;
SubtitleCounter = 7 * TICRATE;
}
}
DEFINE_ACTION_FUNCTION(_PlayerInfo, SetSubtitleNumber)
{
PARAM_SELF_STRUCT_PROLOGUE(player_t);
PARAM_INT(log);
self->SetSubtitle(log);
return 0;
}
int player_t::GetSpawnClass()
{
const PClass * type = PlayerClasses[CurrentPlayerClass].Type;
@ -1633,6 +1657,8 @@ void player_t::Serialize(FSerializer &arc)
("blenda", BlendA)
("weaponstate", WeaponState)
("logtext", LogText)
("subtitletext", SubtitleText)
("subtitlecounter", SubtitleCounter)
("conversionnpc", ConversationNPC)
("conversionpc", ConversationPC)
("conversionnpcangle", ConversationNPCAngle)