Merge branch 'text-prompts' into text-prompts-hidehud
This commit is contained in:
commit
54dc5d1892
|
@ -2074,7 +2074,7 @@ static void F_PreparePageText(char *pagetext)
|
||||||
|
|
||||||
if (promptpagetext)
|
if (promptpagetext)
|
||||||
Z_Free(promptpagetext);
|
Z_Free(promptpagetext);
|
||||||
promptpagetext = (pagetext && pagetext[0]) ? V_WordWrap(textx, textr, 0, pagetext) : "";
|
promptpagetext = (pagetext && pagetext[0]) ? V_WordWrap(textx, textr, 0, pagetext) : Z_StrDup("");
|
||||||
|
|
||||||
F_NewCutscene(promptpagetext);
|
F_NewCutscene(promptpagetext);
|
||||||
cutscene_textspeed = textprompts[cutnum]->page[scenenum].textspeed ? textprompts[cutnum]->page[scenenum].textspeed : TICRATE/5;
|
cutscene_textspeed = textprompts[cutnum]->page[scenenum].textspeed ? textprompts[cutnum]->page[scenenum].textspeed : TICRATE/5;
|
||||||
|
|
Loading…
Reference in New Issue