YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Polishing the vntextbox off.

Browse Source
This commit is contained in:
Dominic Masters
2021-07-18 14:17:19 -07:00
parent 027907d5a4
commit 0d79851553
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/display/gui/font.c
View File

@ -167,7 +167,6 @@ void fontTextClamp(font_t *font, fonttextinfo_t *info, char *text,
int32_t fontGetLineCharCount(fonttextinfo_t *info,int32_t start,int32_t count) { int32_t fontGetLineCharCount(fonttextinfo_t *info,int32_t start,int32_t count) {
int32_t charCount, i, m; int32_t charCount, i, m;
m = mathMin(start+count, info->lineCount); m = mathMin(start+count, info->lineCount);
charCount = 0; charCount = 0;

11
src/vn/gui/vntextbox.c
View File

@ -44,14 +44,10 @@ void vnTextBoxRebuffer(vntextbox_t *box) {
void vnTextBoxUpdate(vntextbox_t *box, engine_t *engine) { void vnTextBoxUpdate(vntextbox_t *box, engine_t *engine) {
int32_t i; int32_t i;
if(vnTextBoxHasScrolled(box)) { // "Next text box"
printf("."); if(vnTextBoxHasScrolled(box) && box->linesMax > 0) {
if(!inputIsPressed(&engine->input, INPUT_ACCEPT)) return; if(!inputIsPressed(&engine->input, INPUT_ACCEPT)) return;
box->lineCurrent += box->linesMax;
// "Next text box"
printf("Next");
i = 1;
box->lineCurrent += i;
return; return;
} }
@ -66,7 +62,6 @@ void vnTextBoxRender(vntextbox_t *box, shader_t *shader) {
if(box->text == NULL) return; if(box->text == NULL) return;
// Determine where we're rendering the indices up to. // Determine where we're rendering the indices up to.
// charCount = box->animTimeline.current * VN_TEXTBOX_SCROLL_SPEED;
charCount = box->textScroll; charCount = box->textScroll;
if(charCount == 0) return; if(charCount == 0) return;