zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-29 23:33:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- transitioned the Conversation menu from FBrokenLines to DBrokenLines so that the internal representation matches scriptable types.

Browse source
This commit is contained in:
Christoph Oelckers 2017-02-19 10:46:53 +01:00
parent 8db1646056
commit 129787546d
1 changed files with 33 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/p_conversation.cpp
View file

@ -711,6 +711,28 @@ static void SendConversationReply(int node, int reply)
StaticLastReply = reply; StaticLastReply = reply;
} }
// Needed for the conversion process.
class DBrokenLines : public DObject
{
DECLARE_ABSTRACT_CLASS(DBrokenLines, DObject)
public:
FBrokenLines *mBroken;
unsigned int mCount;
DBrokenLines(FBrokenLines *broken, unsigned int count)
{
mBroken = broken;
mCount = count;
}
void OnDestroy() override
{
V_FreeBrokenLines(mBroken);
}
};
//============================================================================ //============================================================================
// //
// The conversation menu // The conversation menu
@ -723,7 +745,7 @@ class DConversationMenu : public DMenu
public: public:
FString mSpeaker; FString mSpeaker;
FBrokenLines *mDialogueLines; DBrokenLines *mDialogueLines;
TArray<FString> mResponseLines; TArray<FString> mResponseLines;
TArray<unsigned int> mResponses; TArray<unsigned int> mResponses;
bool mShowGold; bool mShowGold;
@ -770,7 +792,10 @@ public:
{ {
toSay = "."; toSay = ".";
} }
mDialogueLines = V_BreakLines (SmallFont, screen->GetWidth()/CleanXfac - 24*2, toSay); unsigned int count;
auto bl = V_BreakLines (SmallFont, screen->GetWidth()/CleanXfac - 24*2, toSay, true, &count);
mDialogueLines = new DBrokenLines(bl, count);
mSelection = -1; mSelection = -1;
FStrifeDialogueReply *reply; FStrifeDialogueReply *reply;
@ -833,11 +858,8 @@ public:
mResponseLines.Push(FString(goodbyestr)); mResponseLines.Push(FString(goodbyestr));
// Determine where the top of the reply list should be positioned. // Determine where the top of the reply list should be positioned.
i = OptionSettings.mLinespacing; mYpos = MIN<int> (140, 192 - mResponseLines.Size() * OptionSettings.mLinespacing);
mYpos = MIN<int> (140, 192 - mResponseLines.Size() * i); i = 44 + count * (OptionSettings.mLinespacing + 2);
for (i = 0; mDialogueLines[i].Width >= 0; ++i)
{ }
i = 44 + i * 10;
if (mYpos - 100 < i - screen->GetHeight() / CleanYfac / 2) if (mYpos - 100 < i - screen->GetHeight() / CleanYfac / 2)
{ {
mYpos = i - screen->GetHeight() / CleanYfac / 2 + 100; mYpos = i - screen->GetHeight() / CleanYfac / 2 + 100;
@ -861,7 +883,7 @@ public:
void OnDestroy() override void OnDestroy() override
{ {
V_FreeBrokenLines(mDialogueLines); mDialogueLines->Destroy();
mDialogueLines = NULL; mDialogueLines = NULL;
I_SetMusicVolume (1.f); I_SetMusicVolume (1.f);
Super::OnDestroy(); Super::OnDestroy();
@ -1055,9 +1077,7 @@ public:
// Dim the screen behind the dialogue (but only if there is no backdrop). // Dim the screen behind the dialogue (but only if there is no backdrop).
if (!CurNode->Backdrop.isValid()) if (!CurNode->Backdrop.isValid())
{ {
int i; int i = mDialogueLines->mCount;
for (i = 0; mDialogueLines[i].Width >= 0; ++i)
{ }
screen->Dim (0, 0.45f, 14 * screen->GetWidth() / 320, 13 * screen->GetHeight() / 200, screen->Dim (0, 0.45f, 14 * screen->GetWidth() / 320, 13 * screen->GetHeight() / 200,
308 * screen->GetWidth() / 320 - 14 * screen->GetWidth () / 320, 308 * screen->GetWidth() / 320 - 14 * screen->GetWidth () / 320,
speakerName == NULL ? linesize * i + 6 * CleanYfac speakerName == NULL ? linesize * i + 6 * CleanYfac
@ -1078,9 +1098,9 @@ public:
y += linesize * 3 / 2; y += linesize * 3 / 2;
} }
x = 24 * screen->GetWidth() / 320; x = 24 * screen->GetWidth() / 320;
for (int i = 0; mDialogueLines[i].Width >= 0; ++i) for (int i = 0; i < mDialogueLines->mCount; ++i)
{ {
screen->DrawText (SmallFont, CR_UNTRANSLATED, x, y, mDialogueLines[i].Text, screen->DrawText (SmallFont, CR_UNTRANSLATED, x, y, mDialogueLines->mBroken[i].Text,
DTA_CleanNoMove, true, TAG_DONE); DTA_CleanNoMove, true, TAG_DONE);
y += linesize; y += linesize;
} }