eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix monitor word warp

This commit is contained in:
sonil 2022-11-27 20:11:56 +08:00
parent 0c6057c2ae
commit dd197c1abc
1 changed files with 22 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/display_monitor.cc
View File

@ -18,6 +18,7 @@
#include "svga.h" #include "svga.h"
#include "text_font.h" #include "text_font.h"
#include "window_manager.h" #include "window_manager.h"
#include "word_wrap.h"
namespace fallout { namespace fallout {
@ -26,11 +27,11 @@ namespace fallout {
#define DISPLAY_MONITOR_LINES_CAPACITY (100) #define DISPLAY_MONITOR_LINES_CAPACITY (100)
// The maximum length of a string in display monitor (in characters). // The maximum length of a string in display monitor (in characters).
#define DISPLAY_MONITOR_LINE_LENGTH (80) #define DISPLAY_MONITOR_LINE_LENGTH (280)
#define DISPLAY_MONITOR_X (23) #define DISPLAY_MONITOR_X (23)
#define DISPLAY_MONITOR_Y (24) #define DISPLAY_MONITOR_Y (24)
#define DISPLAY_MONITOR_WIDTH (167 + gInterfaceBarContentOffset) #define DISPLAY_MONITOR_WIDTH (175 + gInterfaceBarContentOffset)
#define DISPLAY_MONITOR_HEIGHT (60) #define DISPLAY_MONITOR_HEIGHT (60)
#define DISPLAY_MONITOR_HALF_HEIGHT (DISPLAY_MONITOR_HEIGHT / 2) #define DISPLAY_MONITOR_HALF_HEIGHT (DISPLAY_MONITOR_HEIGHT / 2)
@ -241,13 +242,6 @@ void displayMonitorAddMessage(char* str)
int oldFont = fontGetCurrent(); int oldFont = fontGetCurrent();
fontSetCurrent(DISPLAY_MONITOR_FONT); fontSetCurrent(DISPLAY_MONITOR_FONT);
char knob = '\x95';
char knobString[2];
knobString[0] = knob;
knobString[1] = '\0';
int knobWidth = fontGetStringWidth(knobString);
if (!isInCombat()) { if (!isInCombat()) {
unsigned int now = _get_bk_time(); unsigned int now = _get_bk_time();
if (getTicksBetween(now, gDisplayMonitorLastBeepTimestamp) >= DISPLAY_MONITOR_BEEP_DELAY) { if (getTicksBetween(now, gDisplayMonitorLastBeepTimestamp) >= DISPLAY_MONITOR_BEEP_DELAY) {
@ -256,65 +250,30 @@ void displayMonitorAddMessage(char* str)
} }
} }
// TODO: Refactor these two loops. short beginnings[WORD_WRAP_MAX_COUNT] = {
char* v1 = NULL; -1,
while (true) { };
while (fontGetStringWidth(str) < DISPLAY_MONITOR_WIDTH - _max_disp - knobWidth) { short count = -1;
char* temp = gDisplayMonitorLines[_disp_start];
int length;
if (knob != '\0') {
*temp++ = knob;
length = DISPLAY_MONITOR_LINE_LENGTH - 2;
knob = '\0';
knobWidth = 0;
} else {
length = DISPLAY_MONITOR_LINE_LENGTH - 1;
}
strncpy(temp, str, length);
gDisplayMonitorLines[_disp_start][DISPLAY_MONITOR_LINE_LENGTH - 1] = '\0';
_disp_start = (_disp_start + 1) % gDisplayMonitorLinesCapacity;
if (v1 == NULL) { char start[2048];
fontSetCurrent(oldFont);
_disp_curr = _disp_start; start[0] = '\x95';
displayMonitorRefresh(); strcpy(start + 1, str);
if (wordWrap(start, DISPLAY_MONITOR_WIDTH, beginnings, &count) != 0) {
// FIXME: Leaks handle.
return; return;
} }
str = v1 + 1; for (int index = 0; index < count - 1; index++) {
*v1 = ' '; char* beginning = start + beginnings[index];
v1 = NULL; char* ending = start + beginnings[index + 1];
}
char* space = strrchr(str, ' '); memcpy(gDisplayMonitorLines[_disp_start], beginning, ending - beginning);
if (space == NULL) { gDisplayMonitorLines[_disp_start][ending - beginning] = '\0';
break;
}
if (v1 != NULL) {
*v1 = ' ';
}
v1 = space;
if (space != NULL) {
*space = '\0';
}
}
char* temp = gDisplayMonitorLines[_disp_start];
int length;
if (knob != '\0') {
temp++;
gDisplayMonitorLines[_disp_start][0] = knob;
length = DISPLAY_MONITOR_LINE_LENGTH - 2;
knob = '\0';
} else {
length = DISPLAY_MONITOR_LINE_LENGTH - 1;
}
strncpy(temp, str, length);
gDisplayMonitorLines[_disp_start][DISPLAY_MONITOR_LINE_LENGTH - 1] = '\0';
_disp_start = (_disp_start + 1) % gDisplayMonitorLinesCapacity; _disp_start = (_disp_start + 1) % gDisplayMonitorLinesCapacity;
}
fontSetCurrent(oldFont); fontSetCurrent(oldFont);
_disp_curr = _disp_start; _disp_curr = _disp_start;