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

Merge 83a61188c4 into ffe90eef49

This commit is contained in:
sonilyan 2023-07-14 14:18:56 +08:00 committed by GitHub
parent ffe90eef49 83a61188c4
commit 381f476570
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 2060 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -95,6 +95,8 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
"src/file_utils.h"
"src/font_manager.cc"
"src/font_manager.h"
"src/freetype_manager.cc"
"src/freetype_manager.h"
"src/game_config.cc"
"src/game_config.h"
"src/game_dialog.cc"
@ -374,6 +376,19 @@ target_include_directories(${EXECUTABLE_NAME} PRIVATE ${ZLIB_INCLUDE_DIRS})
target_link_libraries(${EXECUTABLE_NAME} ${SDL2_LIBRARIES})
target_include_directories(${EXECUTABLE_NAME} PRIVATE ${SDL2_INCLUDE_DIRS})
add_subdirectory("third_party/freetype")
target_link_libraries(${EXECUTABLE_NAME} ${FREETYPE_LIBRARIES})
target_include_directories(${EXECUTABLE_NAME} PRIVATE ${FREETYPE_INCLUDE_DIRS})
add_subdirectory("third_party/iconv")
target_link_libraries(${EXECUTABLE_NAME} ${ICONV_LIBRARIES})
target_include_directories(${EXECUTABLE_NAME} PRIVATE ${ICONV_INCLUDE_DIRS})
message(status "${ZLIB_INCLUDE_DIRS}")
message(status "${SDL2_INCLUDE_DIRS}")
message(status "${FREETYPE_INCLUDE_DIRS}")
message(status "${ICONV_INCLUDE_DIRS}")
if(APPLE)
if(IOS)
install(TARGETS ${EXECUTABLE_NAME} DESTINATION "Payload")

55
fonts/chs/font.ini Normal file
View File

@ -0,0 +1,55 @@
[font0]
maxHeight= 10
maxWidth= 10
lineSpacing=0
wordSpacing=4
letterSpacing=1
heightOffset=0
fileName=font.ttf
warpMode=0
encoding=GBK
[font1]
maxHeight= 12
maxWidth= 12
lineSpacing=1
wordSpacing=4
letterSpacing=1
heightOffset=1
fileName=zpix.ttf
warpMode=1
encoding=GBK
[font2]
maxHeight= 15
maxWidth= 15
lineSpacing=1
wordSpacing=3
letterSpacing=1
heightOffset=0
fileName=font.ttf
warpMode=0
encoding=GBK
[font3]
maxHeight= 15
maxWidth= 15
lineSpacing=1
wordSpacing=4
letterSpacing=1
heightOffset=0
fileName=font.ttf
warpMode=0
encoding=GBK
[font4]
maxHeight= 22
maxWidth= 22
lineSpacing=1
wordSpacing=12
letterSpacing=1
heightOffset=0
fileName=font.ttf
warpMode=0
encoding=GBK

BIN
fonts/chs/font.ttf Normal file
View File

Binary file not shown.

BIN
fonts/chs/zpix.ttf Normal file
View File

Binary file not shown.

BIN
fonts/english/JH_FALLOUT.TTF Normal file
View File

Binary file not shown.

BIN
fonts/english/TT0807M_.TTF Normal file
View File

Binary file not shown.

55
fonts/english/font.ini Normal file
View File

@ -0,0 +1,55 @@
[font0]
maxHeight=10
maxWidth=10
lineSpacing=0
wordSpacing=4
letterSpacing=1
heightOffset=0
fileName=r_fallouty.ttf
warpMode=0
encoding=GBK
[font1]
maxHeight=12
maxWidth=12
lineSpacing=0
wordSpacing=4
letterSpacing=1
heightOffset=0
fileName=r_fallouty.ttf
warpMode=0
encoding=GBK
[font2]
maxHeight=15
maxWidth=15
lineSpacing=1
wordSpacing=3
letterSpacing=1
heightOffset=0
fileName=r_fallouty.ttf
warpMode=0
encoding=GBK
[font3]
maxHeight=15
maxWidth=15
lineSpacing=1
wordSpacing=4
letterSpacing=1
heightOffset=0
fileName=r_fallouty.ttf
warpMode=0
encoding=GBK
[font4]
maxHeight=24
maxWidth=24
lineSpacing=1
wordSpacing=12
letterSpacing=1
heightOffset=0
fileName=TT0807M_.TTF
warpMode=0
encoding=GBK

BIN
fonts/english/r_fallouty.ttf Normal file
View File

Binary file not shown.

94
src/character_editor.cc
View File

@ -2390,7 +2390,9 @@ static void characterEditorDrawPcStats()
fontDrawText(gCharacterEditorWindowBuffer + 640 * y + 32, stringBuffer, 640, 640, color);
// EXPERIENCE
y += fontGetLineHeight() + 1;
//y += fontGetLineHeight() + 1;
// Adapt to other languages, because the pixels here are fixed, so the calculation of LineHeight brings trouble - replaces it with fixed pixel values
y += 10 + 1;
if (characterEditorSelectedItem != 8) {
color = _colorTable[992];
} else {
@ -2404,7 +2406,9 @@ static void characterEditorDrawPcStats()
fontDrawText(gCharacterEditorWindowBuffer + 640 * y + 32, stringBuffer, 640, 640, color);
// EXP NEEDED TO NEXT LEVEL
y += fontGetLineHeight() + 1;
//y += fontGetLineHeight() + 1;
// Adapt to other languages, because the pixels here are fixed, so the calculation of LineHeight brings trouble - replaces it with fixed pixel values
y += 10 + 1;
if (characterEditorSelectedItem != 9) {
color = _colorTable[992];
} else {
@ -2656,8 +2660,12 @@ static void characterEditorDrawDerivedStats()
snprintf(t, sizeof(t), "%d/%d", currHp, maxHp);
fontDrawText(gCharacterEditorWindowBuffer + 640 * y + 263, t, 640, 640, color);
// Poisoned
y += fontGetLineHeight() + 3;
//y += fontGetLineHeight() + 3;
// Adapt to other languages, because the pixels here are fixed, so the calculation of LineHeight brings trouble - replaces it with fixed pixel values
y += 13;
if (characterEditorSelectedItem == EDITOR_POISONED) {
color = critterGetPoison(gDude) != 0 ? _colorTable[32747] : _colorTable[15845];
@ -2670,7 +2678,9 @@ static void characterEditorDrawDerivedStats()
fontDrawText(gCharacterEditorWindowBuffer + 640 * y + 194, t, 640, 640, color);
// Radiated
y += fontGetLineHeight() + 3;
//y += fontGetLineHeight() + 3;
// Adapt to other languages, because the pixels here are fixed, so the calculation of LineHeight brings trouble - replaces it with fixed pixel values
y += 13;
if (characterEditorSelectedItem == EDITOR_RADIATED) {
color = critterGetRadiation(gDude) != 0 ? _colorTable[32747] : _colorTable[15845];
@ -2683,7 +2693,9 @@ static void characterEditorDrawDerivedStats()
fontDrawText(gCharacterEditorWindowBuffer + 640 * y + 194, t, 640, 640, color);
// Eye Damage
y += fontGetLineHeight() + 3;
//y += fontGetLineHeight() + 3;
// Adapt to other languages, because the pixels here are fixed, so the calculation of LineHeight brings trouble - replaces it with fixed pixel values
y += 13;
if (characterEditorSelectedItem == EDITOR_EYE_DAMAGE) {
color = (conditions & DAM_BLIND) ? _colorTable[32747] : _colorTable[15845];
@ -2696,7 +2708,9 @@ static void characterEditorDrawDerivedStats()
fontDrawText(gCharacterEditorWindowBuffer + 640 * y + 194, t, 640, 640, color);
// Crippled Right Arm
y += fontGetLineHeight() + 3;
//y += fontGetLineHeight() + 3;
// Adapt to other languages, because the pixels here are fixed, so the calculation of LineHeight brings trouble - replaces it with fixed pixel values
y += 13;
if (characterEditorSelectedItem == EDITOR_CRIPPLED_RIGHT_ARM) {
color = (conditions & DAM_CRIP_ARM_RIGHT) ? _colorTable[32747] : _colorTable[15845];
@ -2709,7 +2723,9 @@ static void characterEditorDrawDerivedStats()
fontDrawText(gCharacterEditorWindowBuffer + 640 * y + 194, t, 640, 640, color);
// Crippled Left Arm
y += fontGetLineHeight() + 3;
//y += fontGetLineHeight() + 3;
// Adapt to other languages, because the pixels here are fixed, so the calculation of LineHeight brings trouble - replaces it with fixed pixel values
y += 13;
if (characterEditorSelectedItem == EDITOR_CRIPPLED_LEFT_ARM) {
color = (conditions & DAM_CRIP_ARM_LEFT) ? _colorTable[32747] : _colorTable[15845];
@ -2722,7 +2738,9 @@ static void characterEditorDrawDerivedStats()
fontDrawText(gCharacterEditorWindowBuffer + 640 * y + 194, t, 640, 640, color);
// Crippled Right Leg
y += fontGetLineHeight() + 3;
//y += fontGetLineHeight() + 3;
// Adapt to other languages, because the pixels here are fixed, so the calculation of LineHeight brings trouble - replaces it with fixed pixel values
y += 13;
if (characterEditorSelectedItem == EDITOR_CRIPPLED_RIGHT_LEG) {
color = (conditions & DAM_CRIP_LEG_RIGHT) ? _colorTable[32747] : _colorTable[15845];
@ -2735,7 +2753,9 @@ static void characterEditorDrawDerivedStats()
fontDrawText(gCharacterEditorWindowBuffer + 640 * y + 194, t, 640, 640, color);
// Crippled Left Leg
y += fontGetLineHeight() + 3;
//y += fontGetLineHeight() + 3;
// Adapt to other languages, because the pixels here are fixed, so the calculation of LineHeight brings trouble - replaces it with fixed pixel values
y += 13;
if (characterEditorSelectedItem == EDITOR_CRIPPLED_LEFT_LEG) {
color = (conditions & DAM_CRIP_LEG_LEFT) ? _colorTable[32747] : _colorTable[15845];
@ -2766,7 +2786,9 @@ static void characterEditorDrawDerivedStats()
fontDrawText(gCharacterEditorWindowBuffer + 640 * y + 288, t, 640, 640, color);
// Action Points
y += fontGetLineHeight() + 3;
//y += fontGetLineHeight() + 3;
// Adapt to other languages, because the pixels here are fixed, so the calculation of LineHeight brings trouble - replaces it with fixed pixel values
y += 13;
if (characterEditorSelectedItem == EDITOR_FIRST_DERIVED_STAT + EDITOR_DERIVED_STAT_ACTION_POINTS) {
color = _colorTable[32747];
@ -2782,7 +2804,9 @@ static void characterEditorDrawDerivedStats()
fontDrawText(gCharacterEditorWindowBuffer + 640 * y + 288, t, 640, 640, color);
// Carry Weight
y += fontGetLineHeight() + 3;
//y += fontGetLineHeight() + 3;
// Adapt to other languages, because the pixels here are fixed, so the calculation of LineHeight brings trouble - replaces it with fixed pixel values
y += 13;
if (characterEditorSelectedItem == EDITOR_FIRST_DERIVED_STAT + EDITOR_DERIVED_STAT_CARRY_WEIGHT) {
color = _colorTable[32747];
@ -2798,7 +2822,9 @@ static void characterEditorDrawDerivedStats()
fontDrawText(gCharacterEditorWindowBuffer + 640 * y + 288, t, 640, 640, critterIsEncumbered(gDude) ? _colorTable[31744] : color);
// Melee Damage
y += fontGetLineHeight() + 3;
//y += fontGetLineHeight() + 3;
// Adapt to other languages, because the pixels here are fixed, so the calculation of LineHeight brings trouble - replaces it with fixed pixel values
y += 13;
if (characterEditorSelectedItem == EDITOR_FIRST_DERIVED_STAT + EDITOR_DERIVED_STAT_MELEE_DAMAGE) {
color = _colorTable[32747];
@ -2820,7 +2846,9 @@ static void characterEditorDrawDerivedStats()
fontDrawText(gCharacterEditorWindowBuffer + 640 * y + 288, t, 640, 640, color);
// Damage Resistance
y += fontGetLineHeight() + 3;
//y += fontGetLineHeight() + 3;
// Adapt to other languages, because the pixels here are fixed, so the calculation of LineHeight brings trouble - replaces it with fixed pixel values
y += 13;
if (characterEditorSelectedItem == EDITOR_FIRST_DERIVED_STAT + EDITOR_DERIVED_STAT_DAMAGE_RESISTANCE) {
color = _colorTable[32747];
@ -2836,7 +2864,9 @@ static void characterEditorDrawDerivedStats()
fontDrawText(gCharacterEditorWindowBuffer + 640 * y + 288, t, 640, 640, color);
// Poison Resistance
y += fontGetLineHeight() + 3;
//y += fontGetLineHeight() + 3;
// Adapt to other languages, because the pixels here are fixed, so the calculation of LineHeight brings trouble - replaces it with fixed pixel values
y += 13;
if (characterEditorSelectedItem == EDITOR_FIRST_DERIVED_STAT + EDITOR_DERIVED_STAT_POISON_RESISTANCE) {
color = _colorTable[32747];
@ -2852,7 +2882,9 @@ static void characterEditorDrawDerivedStats()
fontDrawText(gCharacterEditorWindowBuffer + 640 * y + 288, t, 640, 640, color);
// Radiation Resistance
y += fontGetLineHeight() + 3;
//y += fontGetLineHeight() + 3;
// Adapt to other languages, because the pixels here are fixed, so the calculation of LineHeight brings trouble - replaces it with fixed pixel values
y += 13;
if (characterEditorSelectedItem == EDITOR_FIRST_DERIVED_STAT + EDITOR_DERIVED_STAT_RADIATION_RESISTANCE) {
color = _colorTable[32747];
@ -2868,7 +2900,9 @@ static void characterEditorDrawDerivedStats()
fontDrawText(gCharacterEditorWindowBuffer + 640 * y + 288, t, 640, 640, color);
// Sequence
y += fontGetLineHeight() + 3;
//y += fontGetLineHeight() + 3;
// Adapt to other languages, because the pixels here are fixed, so the calculation of LineHeight brings trouble - replaces it with fixed pixel values
y += 13;
if (characterEditorSelectedItem == EDITOR_FIRST_DERIVED_STAT + EDITOR_DERIVED_STAT_SEQUENCE) {
color = _colorTable[32747];
@ -2884,7 +2918,9 @@ static void characterEditorDrawDerivedStats()
fontDrawText(gCharacterEditorWindowBuffer + 640 * y + 288, t, 640, 640, color);
// Healing Rate
y += fontGetLineHeight() + 3;
//y += fontGetLineHeight() + 3;
// Adapt to other languages, because the pixels here are fixed, so the calculation of LineHeight brings trouble - replaces it with fixed pixel values
y += 13;
if (characterEditorSelectedItem == EDITOR_FIRST_DERIVED_STAT + EDITOR_DERIVED_STAT_HEALING_RATE) {
color = _colorTable[32747];
@ -2900,7 +2936,9 @@ static void characterEditorDrawDerivedStats()
fontDrawText(gCharacterEditorWindowBuffer + 640 * y + 288, t, 640, 640, color);
// Critical Chance
y += fontGetLineHeight() + 3;
//y += fontGetLineHeight() + 3;
// Adapt to other languages, because the pixels here are fixed, so the calculation of LineHeight brings trouble - replaces it with fixed pixel values
y += 13;
if (characterEditorSelectedItem == EDITOR_FIRST_DERIVED_STAT + EDITOR_DERIVED_STAT_CRITICAL_CHANCE) {
color = _colorTable[32747];
@ -2994,11 +3032,15 @@ static void characterEditorDrawSkills(int a1)
fontDrawText(gCharacterEditorWindowBuffer + 640 * y + 573, valueString, 640, 640, color);
y += fontGetLineHeight() + 1;
// Adapt to other languages, because the pixels here are fixed, so the calculation of LineHeight brings trouble - replaces it with fixed pixel values
//y += fontGetLineHeight() + 1;
y += 10 + 1;
}
if (!gCharacterEditorIsCreationMode) {
y = gCharacterEditorCurrentSkill * (fontGetLineHeight() + 1);
// Adapt to other languages, because the pixels here are fixed, so the calculation of LineHeight brings trouble - replaces it with fixed pixel values
//y = gCharacterEditorCurrentSkill * (fontGetLineHeight() + 1);
y = gCharacterEditorCurrentSkill * (10 + 1);
gCharacterEditorSkillValueAdjustmentSliderY = y + 27;
blitBufferToBufferTrans(
@ -5132,7 +5174,9 @@ static void characterEditorHandleInfoButtonPressed(int eventCode)
double mouseY = gCharacterEditorMouseY;
double fontLineHeight = fontGetLineHeight();
double y = 353.0;
double step = fontGetLineHeight() + 3 + 0.56;
// Adapt to other languages, because the pixels here are fixed, so the calculation of LineHeight brings trouble - replaces it with fixed pixel values
//double step = fontGetLineHeight() + 3 + 0.56;
double step = 10 + 3 + 0.56;
int index;
for (index = 0; index < 8; index++) {
if (mouseY >= y - 4.0 && mouseY <= y + fontLineHeight) {
@ -5397,7 +5441,9 @@ static void characterEditorDrawOptionalTraits()
traitsSetSelected(gCharacterEditorTempTraits[0], gCharacterEditorTempTraits[1]);
step = fontGetLineHeight() + 3 + 0.56;
//step = fontGetLineHeight() + 3 + 0.56;
// Adapt to other languages, because the pixels here are fixed, so the calculation of LineHeight brings trouble - replaces it with fixed pixel values
step = 10 + 3 + 0.56;
y = 353;
for (i = 0; i < 8; i++) {
if (i == v0) {
@ -6300,8 +6346,8 @@ static int perkDialogDrawPerks()
qsort(gPerkDialogOptionList, count, sizeof(*gPerkDialogOptionList), perkDialogOptionCompare);
int v16 = count - gPerkDialogTopLine;
if (v16 > 11) {
v16 = 11;
if (v16 > 11 * 12 / (fontGetLineHeight() + 2)) {
v16 = 11 * 12 / (fontGetLineHeight() + 2);
}
v16 += gPerkDialogTopLine;

5
src/character_selector.cc
View File

@ -621,7 +621,10 @@ static bool characterSelectorWindowRenderStats()
fontGetCharacterWidth(0x20);
int vh = fontGetLineHeight();
// Adapt to other languages, because the pixels here are fixed, so the calculation of LineHeight brings trouble - replaces it with fixed pixel values
//int vh = fontGetLineHeight();
int vh = 11;
int y = 40;
// NAME

11
src/dbox.cc
View File

@ -456,8 +456,8 @@ int showDialogBox(const char* title, const char** body, int bodyLength, int x, i
backgroundFrmImage.getWidth(),
titleColor);
}
nextY += fontGetLineHeight();
}
//nextY += fontGetLineHeight();
nextY += 10; }
for (int index = 0; index < bodyLength && nextY < maxY; index++) {
int width = fontGetStringWidth(body[index]);
@ -477,7 +477,8 @@ int showDialogBox(const char* title, const char** body, int bodyLength, int x, i
backgroundFrmImage.getWidth(),
bodyColor);
}
nextY += fontGetLineHeight();
//nextY += fontGetLineHeight();
nextY += 10;
} else {
short beginnings[WORD_WRAP_MAX_COUNT];
short count;
@ -515,8 +516,8 @@ int showDialogBox(const char* title, const char** body, int bodyLength, int x, i
backgroundFrmImage.getWidth(),
bodyColor);
}
nextY += fontGetLineHeight();
}
//nextY += fontGetLineHeight();
nextY += 10; }
}
}

87
src/display_monitor.cc
View File

@ -18,6 +18,7 @@
#include "svga.h"
#include "text_font.h"
#include "window_manager.h"
#include "word_wrap.h"
namespace fallout {
@ -26,7 +27,7 @@ namespace fallout {
#define DISPLAY_MONITOR_LINES_CAPACITY (100)
// 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_Y (24)
@ -113,6 +114,7 @@ int displayMonitorInit()
gDisplayMonitorLinesCapacity = DISPLAY_MONITOR_LINES_CAPACITY;
_max_disp = DISPLAY_MONITOR_HEIGHT / fontGetLineHeight();
if (_max_disp < 5) _max_disp = 5;
_disp_start = 0;
_disp_curr = 0;
fontSetCurrent(oldFont);
@ -241,13 +243,6 @@ void displayMonitorAddMessage(char* str)
int oldFont = fontGetCurrent();
fontSetCurrent(DISPLAY_MONITOR_FONT);
char knob = '\x95';
char knobString[2];
knobString[0] = knob;
knobString[1] = '\0';
int knobWidth = fontGetStringWidth(knobString);
if (!isInCombat()) {
unsigned int now = _get_bk_time();
if (getTicksBetween(now, gDisplayMonitorLastBeepTimestamp) >= DISPLAY_MONITOR_BEEP_DELAY) {
@ -255,66 +250,31 @@ void displayMonitorAddMessage(char* str)
soundPlayFile("monitor");
}
}
short beginnings[WORD_WRAP_MAX_COUNT] = {
-1,
};
short count = -1;
// TODO: Refactor these two loops.
char* v1 = NULL;
while (true) {
while (fontGetStringWidth(str) < DISPLAY_MONITOR_WIDTH - _max_disp - knobWidth) {
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;
char start[2048];
if (v1 == NULL) {
fontSetCurrent(oldFont);
_disp_curr = _disp_start;
displayMonitorRefresh();
return;
}
start[0] = '\x95';
strcpy(start + 1, str);
str = v1 + 1;
*v1 = ' ';
v1 = NULL;
}
char* space = strrchr(str, ' ');
if (space == NULL) {
break;
}
if (v1 != NULL) {
*v1 = ' ';
}
v1 = space;
if (space != NULL) {
*space = '\0';
}
if (wordWrap(start, DISPLAY_MONITOR_WIDTH, beginnings, &count) != 0) {
// FIXME: Leaks handle.
return;
}
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);
for (int index = 0; index < count - 1; index++) {
char* beginning = start + beginnings[index];
char* ending = start + beginnings[index + 1];
gDisplayMonitorLines[_disp_start][DISPLAY_MONITOR_LINE_LENGTH - 1] = '\0';
_disp_start = (_disp_start + 1) % gDisplayMonitorLinesCapacity;
memcpy(gDisplayMonitorLines[_disp_start], beginning, ending - beginning);
gDisplayMonitorLines[_disp_start][ending - beginning] = '\0';
_disp_start = (_disp_start + 1) % gDisplayMonitorLinesCapacity;
}
fontSetCurrent(oldFont);
_disp_curr = _disp_start;
@ -362,9 +322,10 @@ static void displayMonitorRefresh()
int oldFont = fontGetCurrent();
fontSetCurrent(DISPLAY_MONITOR_FONT);
int tmp = fontGetLineHeight() > 12 ? 12 : fontGetLineHeight();
for (int index = 0; index < _max_disp; index++) {
int stringIndex = (_disp_curr + gDisplayMonitorLinesCapacity + index - _max_disp) % gDisplayMonitorLinesCapacity;
fontDrawText(buf + index * _intface_full_width * fontGetLineHeight(), gDisplayMonitorLines[stringIndex], DISPLAY_MONITOR_WIDTH, _intface_full_width, _colorTable[992]);
fontDrawText(buf + index * _intface_full_width * tmp, gDisplayMonitorLines[stringIndex], DISPLAY_MONITOR_WIDTH, _intface_full_width, _colorTable[992]);
// Even though the display monitor is rectangular, it's graphic is not.
// To give a feel of depth it's covered by some metal canopy and

2
src/font_manager.cc
View File

@ -6,6 +6,7 @@
#include "color.h"
#include "db.h"
#include "memory_manager.h"
#include "word_wrap.h"
// The maximum number of interface fonts.
#define INTERFACE_FONT_MAX (16)
@ -63,6 +64,7 @@ FontManager gModernFontManager = {
interfaceFontGetLetterSpacingImpl,
interfaceFontGetBufferSizeImpl,
interfaceFontGetMonospacedCharacterWidthImpl,
leagcyWordWrap,
};
// 0x586838

596
src/freetype_manager.cc Normal file
View File

@ -0,0 +1,596 @@
#include "font_manager.h"
#include <stdio.h>
#include <string.h>
#include "color.h"
#include "db.h"
#include "memory_manager.h"
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_GLYPH_H
#include FT_BITMAP_H
#include "config.h"
#include "word_wrap.h"
#include <map>
#include "iconv.h"
#include "settings.h"
// The maximum number of interface fonts.
#define FT_FONT_MAX (16)
namespace fallout {
typedef struct FtFontGlyph {
short width;
short rows;
short left;
short top;
unsigned char* buffer;
} FtFontGlyph;
typedef struct FtFontDescriptor {
FT_Library library;
FT_Face face;
unsigned char* filebuffer;
int maxHeight;
int maxWidth;
int letterSpacing;
int wordSpacing;
int lineSpacing;
int heightOffset;
int warpMode;
char encoding[64];
std::map<uint32_t, FtFontGlyph> map;
} FtFontDescriptor;
static int FtFontLoad(int font);
static void FtFontSetCurrentImpl(int font);
static int FtFontGetLineHeightImpl();
static int FtFontGetStringWidthImpl(const char* string);
static int FtFontGetCharacterWidthImpl(int ch);
static int FtFontGetMonospacedStringWidthImpl(const char* string);
static int FtFontGetLetterSpacingImpl();
static int FtFontGetBufferSizeImpl(const char* string);
static int FtFontGetMonospacedCharacterWidthImpl();
static void FtFontDrawImpl(unsigned char* buf, const char* string, int length, int pitch, int color);
static int FtFonteWordWrapImpl(const char* string, int width, short* breakpoints, short* breakpointsLengthPtr);
// 0x518680
static bool gFtFontsInitialized = false;
// 0x518684
static int gFtFontsLength = 0;
static int knobWidth = 5;
static int knobHeight = 7;
static unsigned char knobDump[35] = {
0x34, 0x82, 0xb6, 0x82,
0x34, 0x82, 0xb6, 0xb6,
0xb6, 0x82, 0xb6, 0xb6,
0xb6, 0xb6, 0xb6, 0x82,
0xb6, 0xb6, 0xb6, 0x82,
0x34, 0x82, 0xb6, 0x82,
0x34, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0
};
// 0x518688
FontManager gFtFontManager = {
100,
110,
FtFontSetCurrentImpl,
FtFontDrawImpl,
FtFontGetLineHeightImpl,
FtFontGetStringWidthImpl,
FtFontGetCharacterWidthImpl,
FtFontGetMonospacedStringWidthImpl,
FtFontGetLetterSpacingImpl,
FtFontGetBufferSizeImpl,
FtFontGetMonospacedCharacterWidthImpl,
FtFonteWordWrapImpl,
};
// 0x586838
static FtFontDescriptor gFtFontDescriptors[FT_FONT_MAX];
// 0x58E938
static int gCurrentFtFont;
// 0x58E93C
static FtFontDescriptor* current;
static uint32_t output[1024] = {
0x0,
};
static int LtoU(const char* input, size_t charInPutLen)
{
if (input[0] == '\x95') {
size_t output_size = 1024;
iconv_t cd = iconv_open("UCS-4-INTERNAL", current->encoding);
char* tmp = (char*)(output + 1);
const char* tmp2 = (const char *)(input + 1);
charInPutLen -= 1;
iconv(cd, &tmp2, &charInPutLen, &tmp, &output_size);
iconv_close(cd);
output[0] = '\x95';
return (1024 - output_size) / 4 + 1;
} else {
size_t output_size = 1024;
iconv_t cd = iconv_open("UCS-4-INTERNAL", current->encoding);
char* tmp = (char*)output;
iconv(cd, &input, &charInPutLen, &tmp, &output_size);
iconv_close(cd);
return (1024 - output_size) / 4;
}
}
static int UtoL(const char* input, size_t charInPutLen)
{
size_t output_size = 1024;
iconv_t cd = iconv_open(current->encoding, "UCS-4-INTERNAL");
char* tmp = (char*)output;
iconv(cd, &input, &charInPutLen, &tmp, &output_size);
iconv_close(cd);
return (1024 - output_size);
}
static FtFontGlyph GetFtFontGlyph(uint32_t unicode)
{
if (current->map.count(unicode) > 0) {
return current->map[unicode];
} else {
if (unicode == '\x95') {
current->map[unicode].left = 0;
current->map[unicode].top = current->maxHeight / 2;
current->map[unicode].width = knobWidth;
current->map[unicode].rows = knobHeight;
current->map[unicode].buffer = knobDump;
} else {
FT_Load_Glyph(current->face, FT_Get_Char_Index(current->face, unicode), FT_LOAD_DEFAULT | FT_LOAD_NO_BITMAP);
FT_Render_Glyph(current->face->glyph, FT_RENDER_MODE_NORMAL);
current->map[unicode].left = current->face->glyph->bitmap_left;
current->map[unicode].top = current->face->glyph->bitmap_top;
current->map[unicode].width = current->face->glyph->bitmap.width;
current->map[unicode].rows = current->face->glyph->bitmap.rows;
int count = current->face->glyph->bitmap.width * current->face->glyph->bitmap.rows;
if (count > 0) {
current->map[unicode].buffer = (unsigned char*)internal_malloc_safe(count, __FILE__, __LINE__); // FONTMGR.C, 259
memcpy(current->map[unicode].buffer, current->face->glyph->bitmap.buffer, count);
} else {
current->map[unicode].buffer = NULL;
}
}
return current->map[unicode];
}
}
// 0x441C80
int FtFontsInit()
{
int currentFont = -1;
for (int font = 0; font < FT_FONT_MAX; font++) {
if (FtFontLoad(font) == -1) {
gFtFontDescriptors[font].maxHeight = 0;
gFtFontDescriptors[font].filebuffer = NULL;
} else {
++gFtFontsLength;
if (currentFont == -1) {
currentFont = font;
}
gFtFontManager.maxFont = gFtFontsLength + 100;
}
}
if (currentFont == -1) {
return -1;
}
gFtFontsInitialized = true;
FtFontSetCurrentImpl(currentFont + 100);
return 0;
}
// 0x441CEC
void FtFontsExit()
{
for (int font = 0; font < FT_FONT_MAX; font++) {
if (gFtFontDescriptors[font].filebuffer != NULL) {
internal_free_safe(gFtFontDescriptors[font].filebuffer, __FILE__, __LINE__); // FONTMGR.C, 124
}
}
//TODO: clean up
}
// 0x441D20
static int FtFontLoad(int font_index)
{
char string[56];
FtFontDescriptor* desc = &(gFtFontDescriptors[font_index]);
Config config;
if (!configInit(&config)) {
return -1;
}
sprintf(string, "fonts/%s/font.ini", settings.system.language.c_str());
if (!configRead(&config, string, false)) {
return -1;
}
sprintf(string, "font%d", font_index);
if (!configGetInt(&config, string, "maxHeight", &desc->maxHeight)) {
return -1;
}
if (!configGetInt(&config, string, "maxWidth", &desc->maxWidth)) {
desc->maxWidth = desc->maxHeight;
}
if (!configGetInt(&config, string, "lineSpacing", &desc->lineSpacing)) {
return -1;
}
if (!configGetInt(&config, string, "wordSpacing", &desc->wordSpacing)) {
return -1;
}
if (!configGetInt(&config, string, "letterSpacing", &desc->letterSpacing)) {
return -1;
}
if (!configGetInt(&config, string, "heightOffset", &desc->heightOffset)) {
return -1;
}
if (!configGetInt(&config, string, "warpMode", &desc->warpMode)) {
return -1;
}
char* encoding = NULL;
if (!configGetString(&config, string, "encoding", &encoding)) {
return -1;
}
strcpy(desc->encoding, encoding);
char *fontFileName = NULL;
if (!configGetString(&config, string, "fileName", &fontFileName)) {
return -1;
}
sprintf(string, "fonts/%s/%s", settings.system.language.c_str(), fontFileName);
File* stream = fileOpen(string, "rb");
if (stream == NULL) {
return -1;
}
int fileSize = fileGetSize(stream); //19647736
desc->filebuffer = (unsigned char*)internal_malloc_safe(fileSize, __FILE__, __LINE__); // FONTMGR.C, 259
int readleft = fileSize;
unsigned char* ptr = desc->filebuffer;
while (readleft > 10000) {
int readsize = fileRead(ptr, 1, 10000, stream);
if (readsize != 10000) {
return -1;
}
readleft -= 10000;
ptr += 10000;
}
if (fileRead(ptr, 1, readleft, stream) != readleft) {
return -1;
}
FT_Init_FreeType(&(desc->library));
FT_New_Memory_Face(desc->library, desc->filebuffer, fileSize, 0, &desc->face);
FT_Select_Charmap(desc->face, FT_ENCODING_UNICODE);
FT_Set_Pixel_Sizes(desc->face, desc->maxWidth, desc->maxHeight);
fileClose(stream);
configFree(&config);
return 0;
}
// 0x442120
static void FtFontSetCurrentImpl(int font)
{
if (!gFtFontsInitialized) {
return;
}
font -= 100;
if (gFtFontDescriptors[font].filebuffer != NULL) {
gCurrentFtFont = font;
current = &(gFtFontDescriptors[font]);
}
}
// 0x442168
static int FtFontGetLineHeightImpl()
{
if (!gFtFontsInitialized) {
return 0;
}
return current->lineSpacing + current->maxHeight + current->heightOffset;
}
// 0x442188
static int FtFontGetStringWidthImpl(const char* string)
{
if (!gFtFontsInitialized) {
return 0;
}
if (strlen(string) == 1 && string[0] < 0) {
return current->wordSpacing;
} else {
int count;
int width = 0;
count = LtoU((char*)string, strlen(string));
for (int i = 0; i < count; i++) {
uint32_t ch = output[i];
if (ch == L'\n' || ch == L'\r') {
continue;
}
if (ch == '\x95') {
FtFontGlyph g = GetFtFontGlyph(ch);
width += g.width + current->letterSpacing + 2;
} else if (ch == L' ' || (ch < 256 && ch > 128)) {
width += current->wordSpacing + current->letterSpacing;
} else {
FtFontGlyph g = GetFtFontGlyph(ch);
width += g.width + current->letterSpacing;
}
}
return width;
}
}
// 0x4421DC
static int FtFontGetCharacterWidthImpl(int ch)
{
if (!gFtFontsInitialized) {
return 0;
}
return current->wordSpacing;
}
// 0x442210
static int FtFontGetMonospacedStringWidthImpl(const char* str)
{
return FtFontGetStringWidthImpl(str);
}
// 0x442240
static int FtFontGetLetterSpacingImpl()
{
if (!gFtFontsInitialized) {
return 0;
}
return current->letterSpacing;
}
// 0x442258
static int FtFontGetBufferSizeImpl(const char* str)
{
if (!gFtFontsInitialized) {
return 0;
}
return FtFontGetStringWidthImpl(str) * (current->lineSpacing + current->maxHeight + current->heightOffset);
}
// 0x442278
static int FtFontGetMonospacedCharacterWidthImpl()
{
if (!gFtFontsInitialized) {
return 0;
}
return current->lineSpacing + current->maxHeight;
}
// 0x4422B4
static void FtFontDrawImpl(unsigned char* buf, const char* string, int length, int pitch, int color)
{
if (!gFtFontsInitialized) {
return;
}
if ((color & FONT_SHADOW) != 0) {
color &= ~FONT_SHADOW;
// NOTE: Other font options preserved. This is different from text font
// shadows.
FtFontDrawImpl(buf + pitch + 1, string, length, pitch, (color & ~0xFF) | _colorTable[0]);
}
unsigned char* palette = _getColorBlendTable(color & 0xFF);
int count = LtoU((char*)string, strlen(string));
int maxTop = -1;
for (int i = 0; i < count; i++) {
uint32_t ch = output[i];
FtFontGlyph g = GetFtFontGlyph(ch);
if (maxTop < g.top)
maxTop = g.top;
}
maxTop = current->maxHeight - maxTop;
unsigned char* ptr = buf;
for (int i = 0; i < count; i++) {
uint32_t ch = output[i];
FtFontGlyph g = GetFtFontGlyph(ch);
int characterWidth;
if (ch == L'\n' || ch == L'\r') {
continue;
} else if (ch == L' ') {
characterWidth = current->wordSpacing;
} else if (ch == '\x95') {
characterWidth = g.width + 2;
} else {
characterWidth = g.width;
}
unsigned char* end = ptr + characterWidth + current->letterSpacing;
if (end - buf > length) {
break;
}
ptr += (current->maxHeight - g.top - maxTop) * pitch;
unsigned char* glyphDataPtr = g.buffer;
for (int y = 0; y < g.rows && y < current->maxHeight; y++) {
for (int x = 0; x < g.width; x++) {
unsigned char byte = *glyphDataPtr++;
byte /= 26;
*ptr++ = palette[(byte << 8) + *ptr];
}
ptr += pitch - g.width;
}
ptr = end;
}
if ((color & FONT_UNDERLINE) != 0) {
int length = ptr - buf;
unsigned char* underlinePtr = buf + pitch * (current->maxHeight - 1);
for (int index = 0; index < length; index++) {
*underlinePtr++ = color & 0xFF;
}
}
_freeColorBlendTable(color & 0xFF);
}
static int FtFonteWordWrapImpl(const char* string, int width, short* breakpoints, short* breakpointsLengthPtr)
{
breakpoints[0] = 0;
*breakpointsLengthPtr = 1;
for (int index = 1; index < WORD_WRAP_MAX_COUNT; index++) {
breakpoints[index] = -1;
}
if (fontGetStringWidth(string) < width) {
breakpoints[*breakpointsLengthPtr] = (short)strlen(string);
*breakpointsLengthPtr += 1;
return 0;
}
int accum = 0;
int prevSpaceOrHyphen = -1;
int count = LtoU((char*)string, strlen(string));
int PreCharIndex;
int uint32Index;
int CharIndex = 0;
for (int i = 0; i < count;)
{
const uint32_t ch = output[i];
if (ch == L'\n' || ch == L'\r') {
continue;
}
FtFontGlyph g = GetFtFontGlyph(ch);
PreCharIndex = CharIndex;
if (ch == L' ' || (ch > 128 && ch < 256)) {
accum += current->letterSpacing + current->wordSpacing;
CharIndex += 1;
} else {
if (ch == '\x95')
accum += current->letterSpacing + g.width + 2;
else
accum += current->letterSpacing + g.width;
if ((ch > 0 && ch < 128) || ch == '\x95')
CharIndex += 1;
else
CharIndex += UtoL((char*)(&(output[i])), sizeof(uint32_t));
}
if (accum <= width) {
// NOTE: quests.txt #807 uses extended ascii.
if (ch == L' ' || ch == L'-') {
prevSpaceOrHyphen = CharIndex;
uint32Index = i;
} else if (current->warpMode == 1) {
prevSpaceOrHyphen = -1;
}
i++;
} else {
if (*breakpointsLengthPtr == WORD_WRAP_MAX_COUNT) {
return -1;
}
if (prevSpaceOrHyphen != -1) {
// Word wrap.
breakpoints[*breakpointsLengthPtr] = prevSpaceOrHyphen;
i = uint32Index + 1;
CharIndex = prevSpaceOrHyphen + 1;
} else {
// Character wrap.
breakpoints[*breakpointsLengthPtr] = PreCharIndex;
CharIndex = PreCharIndex;
}
*breakpointsLengthPtr += 1;
prevSpaceOrHyphen = -1;
accum = 0;
}
}
if (*breakpointsLengthPtr == WORD_WRAP_MAX_COUNT) {
return -1;
}
breakpoints[*breakpointsLengthPtr] = CharIndex;
*breakpointsLengthPtr += 1;
return 0;
}
} // namespace fallout

15
src/freetype_manager.h Normal file
View File

@ -0,0 +1,15 @@
#ifndef FREETYPE_MANAGER_H
#define FREETYPE_MANAGER_H
#include "text_font.h"
namespace fallout {
extern FontManager gFtFontManager;
int FtFontsInit();
void FtFontsExit();
} // namespace fallout
#endif /* FONT_MANAGER_H */

12
src/game.cc
View File

@ -21,6 +21,7 @@
#include "draw.h"
#include "endgame.h"
#include "font_manager.h"
#include "freetype_manager.h"
#include "game_dialog.h"
#include "game_memory.h"
#include "game_mouse.h"
@ -168,8 +169,14 @@ int gameInitWithOptions(const char* windowTitle, bool isMapper, int font, int a4
showSplash();
}
interfaceFontsInit();
fontManagerAdd(&gModernFontManager);
if (!FtFontsInit()) {
fontManagerAdd(&gFtFontManager);
}
if (!interfaceFontsInit()) {
fontManagerAdd(&gModernFontManager);
}
fontSetCurrent(font);
screenshotHandlerConfigure(KEY_F12, gameTakeScreenshot);
@ -461,6 +468,7 @@ void gameExit()
wmWorldMap_exit();
partyMembersExit();
endgameDeathEndingExit();
FtFontsExit();
interfaceFontsExit();
_windowClose();
messageListRepositoryExit();

136
src/game_dialog.cc
View File

@ -40,6 +40,7 @@
#include "text_object.h"
#include "tile.h"
#include "window_manager.h"
#include "word_wrap.h"
namespace fallout {
@ -589,7 +590,7 @@ static void gameDialogTicker();
static void _gdialog_scroll_subwin(int a1, int a2, unsigned char* a3, unsigned char* a4, unsigned char* a5, int a6, int a7);
static int _text_num_lines(const char* a1, int a2);
static int text_to_rect_wrapped(unsigned char* buffer, Rect* rect, char* string, int* a4, int height, int pitch, int color);
static int gameDialogDrawText(unsigned char* buffer, Rect* rect, char* string, int* a4, int height, int pitch, int color, int a7);
static int gameDialogDrawText(unsigned char* buffer, Rect* rect, char* string, int* a4, int height, int pitch, int color);
static int _gdialog_barter_create_win();
static void _gdialog_barter_destroy_win();
static void _gdialog_barter_cleanup_tables();
@ -3040,117 +3041,64 @@ int _text_num_lines(const char* a1, int a2)
// 0x447F80
static int text_to_rect_wrapped(unsigned char* buffer, Rect* rect, char* string, int* a4, int height, int pitch, int color)
{
return gameDialogDrawText(buffer, rect, string, a4, height, pitch, color, 1);
return gameDialogDrawText(buffer, rect, string, a4, height, pitch, color);
}
// display_msg
// 0x447FA0
int gameDialogDrawText(unsigned char* buffer, Rect* rect, char* string, int* a4, int height, int pitch, int color, int a7)
int gameDialogDrawText(unsigned char* buffer, Rect* rect, char* string, int* offset, int height, int pitch, int color)
{
short beginnings[WORD_WRAP_MAX_COUNT] = {
-1,
};
short count = -1;
int maxWidth = rect->right - rect->left;
char* start;
if (a4 != NULL) {
start = string + *a4;
if (offset != NULL) {
start = string + *offset;
} else {
start = string;
}
int maxWidth = rect->right - rect->left;
char* end = NULL;
while (start != NULL && *start != '\0') {
if (fontGetStringWidth(start) > maxWidth) {
end = start + 1;
while (*end != '\0' && *end != ' ') {
end++;
}
if (*end != '\0') {
char* lookahead = end + 1;
while (lookahead != NULL) {
while (*lookahead != '\0' && *lookahead != ' ') {
lookahead++;
}
if (*lookahead == '\0') {
lookahead = NULL;
} else {
*lookahead = '\0';
if (fontGetStringWidth(start) >= maxWidth) {
*lookahead = ' ';
lookahead = NULL;
} else {
end = lookahead;
*lookahead = ' ';
lookahead++;
}
}
}
if (*end == ' ') {
*end = '\0';
}
} else {
if (rect->bottom - fontGetLineHeight() < rect->top) {
return rect->top;
}
if (a7 != 1 || start == string) {
fontDrawText(buffer + pitch * rect->top + 10, start, maxWidth, pitch, color);
} else {
fontDrawText(buffer + pitch * rect->top, start, maxWidth, pitch, color);
}
if (a4 != NULL) {
*a4 += static_cast<int>(strlen(start)) + 1;
}
rect->top += height;
return rect->top;
if (wordWrap(start, maxWidth, beginnings, &count) != 0) {
// FIXME: Leaks handle.
return rect->top;
}
int tmp = 0;
for (int index = 0; index < count - 1; index++) {
if (rect->top + height > rect->bottom) {
if (offset != NULL) {
*offset = tmp;
}
return rect->top;
}
if (fontGetStringWidth(start) > maxWidth) {
debugPrint("\nError: display_msg: word too long!");
break;
}
char* beginning = start + beginnings[index];
char* ending = start + beginnings[index + 1];
if (a7 != 0) {
if (rect->bottom - fontGetLineHeight() < rect->top) {
if (end != NULL && *end == '\0') {
*end = ' ';
}
return rect->top;
}
unsigned char* dest;
if (a7 != 1 || start == string) {
dest = buffer + 10;
} else {
dest = buffer;
}
fontDrawText(dest + pitch * rect->top, start, maxWidth, pitch, color);
}
if (a4 != NULL && end != NULL) {
*a4 += static_cast<int>(strlen(start)) + 1;
}
rect->top += height;
if (end != NULL) {
start = end + 1;
if (*end == '\0') {
*end = ' ';
}
end = NULL;
char tmpchar = ending[0];
ending[0] = '\0';
if (beginning == string) {
fontDrawText(buffer + pitch * rect->top + 10, beginning, maxWidth, pitch, color);
} else {
start = NULL;
fontDrawText(buffer + pitch * rect->top, beginning, maxWidth, pitch, color);
}
}
ending[0] = tmpchar;
if (a4 != NULL) {
*a4 = 0;
}
tmp += ending - beginning;
if (offset != NULL) {
*offset += ending - beginning;
}
rect->top += height;
}
if (offset != NULL) {
*offset = 0;
}
return rect->top;
}

32
src/inventory.cc
View File

@ -2894,14 +2894,14 @@ static void inventoryRenderSummary()
bufferDrawLine(windowBuffer,
INVENTORY_WINDOW_WIDTH,
INVENTORY_SUMMARY_X,
3 * fontGetLineHeight() / 2 + INVENTORY_SUMMARY_Y,
3 * 10 / 2 + INVENTORY_SUMMARY_Y,
INVENTORY_SUMMARY_MAX_X,
3 * fontGetLineHeight() / 2 + INVENTORY_SUMMARY_Y,
3 * 10 / 2 + INVENTORY_SUMMARY_Y,
_colorTable[992]);
MessageListItem messageListItem;
int offset = INVENTORY_WINDOW_WIDTH * 2 * fontGetLineHeight() + INVENTORY_WINDOW_WIDTH * INVENTORY_SUMMARY_Y + INVENTORY_SUMMARY_X;
int offset = INVENTORY_WINDOW_WIDTH * 2 * 10 + INVENTORY_WINDOW_WIDTH * INVENTORY_SUMMARY_Y + INVENTORY_SUMMARY_X;
for (int stat = 0; stat < 7; stat++) {
messageListItem.num = stat;
if (messageListGetItem(&gInventoryMessageList, &messageListItem)) {
@ -2912,10 +2912,10 @@ static void inventoryRenderSummary()
snprintf(formattedText, sizeof(formattedText), "%d", value);
fontDrawText(windowBuffer + offset + 24, formattedText, 80, INVENTORY_WINDOW_WIDTH, _colorTable[992]);
offset += INVENTORY_WINDOW_WIDTH * fontGetLineHeight();
offset += INVENTORY_WINDOW_WIDTH * 10;
}
offset -= INVENTORY_WINDOW_WIDTH * 7 * fontGetLineHeight();
offset -= INVENTORY_WINDOW_WIDTH * 7 * 10;
for (int index = 0; index < 7; index += 1) {
messageListItem.num = 7 + index;
@ -2935,11 +2935,11 @@ static void inventoryRenderSummary()
fontDrawText(windowBuffer + offset + 104, formattedText, 80, INVENTORY_WINDOW_WIDTH, _colorTable[992]);
offset += INVENTORY_WINDOW_WIDTH * fontGetLineHeight();
offset += INVENTORY_WINDOW_WIDTH * 10;
}
bufferDrawLine(windowBuffer, INVENTORY_WINDOW_WIDTH, INVENTORY_SUMMARY_X, 18 * fontGetLineHeight() / 2 + 48, INVENTORY_SUMMARY_MAX_X, 18 * fontGetLineHeight() / 2 + 48, _colorTable[992]);
bufferDrawLine(windowBuffer, INVENTORY_WINDOW_WIDTH, INVENTORY_SUMMARY_X, 26 * fontGetLineHeight() / 2 + 48, INVENTORY_SUMMARY_MAX_X, 26 * fontGetLineHeight() / 2 + 48, _colorTable[992]);
bufferDrawLine(windowBuffer, INVENTORY_WINDOW_WIDTH, INVENTORY_SUMMARY_X, 18 * 10 / 2 + 48, INVENTORY_SUMMARY_MAX_X, 18 * 10 / 2 + 48, _colorTable[992]);
bufferDrawLine(windowBuffer, INVENTORY_WINDOW_WIDTH, INVENTORY_SUMMARY_X, 26 * 10 / 2 + 48, INVENTORY_SUMMARY_MAX_X, 26 * 10 / 2 + 48, _colorTable[992]);
Object* itemsInHands[2] = {
gInventoryLeftHandItem,
@ -2961,7 +2961,7 @@ static void inventoryRenderSummary()
HIT_MODE_KICK,
};
offset += INVENTORY_WINDOW_WIDTH * fontGetLineHeight();
offset += INVENTORY_WINDOW_WIDTH * 10;
for (int index = 0; index < 2; index += 1) {
Object* item = itemsInHands[index];
@ -2974,7 +2974,7 @@ static void inventoryRenderSummary()
fontDrawText(windowBuffer + offset, messageListItem.text, 120, INVENTORY_WINDOW_WIDTH, _colorTable[992]);
}
offset += INVENTORY_WINDOW_WIDTH * fontGetLineHeight();
offset += INVENTORY_WINDOW_WIDTH * 10;
// Unarmed dmg:
messageListItem.num = 24;
@ -3010,14 +3010,14 @@ static void inventoryRenderSummary()
fontDrawText(windowBuffer + offset, formattedText, 120, INVENTORY_WINDOW_WIDTH, _colorTable[992]);
offset += 3 * INVENTORY_WINDOW_WIDTH * fontGetLineHeight();
offset += 3 * INVENTORY_WINDOW_WIDTH * 10;
continue;
}
const char* itemName = itemGetName(item);
fontDrawText(windowBuffer + offset, itemName, 140, INVENTORY_WINDOW_WIDTH, _colorTable[992]);
offset += INVENTORY_WINDOW_WIDTH * fontGetLineHeight();
offset += INVENTORY_WINDOW_WIDTH * 10;
int itemType = itemGetType(item);
if (itemType != ITEM_TYPE_WEAPON) {
@ -3029,7 +3029,7 @@ static void inventoryRenderSummary()
}
}
offset += 3 * INVENTORY_WINDOW_WIDTH * fontGetLineHeight();
offset += 3 * INVENTORY_WINDOW_WIDTH * 10;
continue;
}
@ -3108,7 +3108,7 @@ static void inventoryRenderSummary()
fontDrawText(windowBuffer + offset, formattedText, 140, INVENTORY_WINDOW_WIDTH, _colorTable[992]);
}
offset += INVENTORY_WINDOW_WIDTH * fontGetLineHeight();
offset += INVENTORY_WINDOW_WIDTH * 10;
if (ammoGetCapacity(item) > 0) {
int ammoTypePid = weaponGetAmmoTypePid(item);
@ -3138,7 +3138,7 @@ static void inventoryRenderSummary()
fontDrawText(windowBuffer + offset, formattedText, 140, INVENTORY_WINDOW_WIDTH, _colorTable[992]);
}
offset += 2 * INVENTORY_WINDOW_WIDTH * fontGetLineHeight();
offset += 2 * INVENTORY_WINDOW_WIDTH * 10;
}
// Total wt:
@ -3637,7 +3637,7 @@ static void inventoryExamineItem(Object* critter, Object* item)
if (backgroundFrmImage.lock(backgroundFid)) {
blitBufferToBuffer(backgroundFrmImage.getData() + INVENTORY_WINDOW_WIDTH * INVENTORY_SUMMARY_Y + INVENTORY_SUMMARY_X,
152,
188,
200,
INVENTORY_WINDOW_WIDTH,
windowBuffer + INVENTORY_WINDOW_WIDTH * INVENTORY_SUMMARY_Y + INVENTORY_SUMMARY_X,
INVENTORY_WINDOW_WIDTH);

18
src/loadsave.cc
View File

@ -554,7 +554,8 @@ int lsgSaveGame(int mode)
int mouseY;
mouseGetPositionInWindow(gLoadSaveWindow, &mouseX, &mouseY);
_slot_cursor = (mouseY - 79) / (3 * fontGetLineHeight() + 4);
//_slot_cursor = (mouseY - 79) / (3 * fontGetLineHeight() + 4);
_slot_cursor = (mouseY - 79) / (3 * 10 + 4);
if (_slot_cursor < 0) {
_slot_cursor = 0;
}
@ -1059,7 +1060,8 @@ int lsgLoadGame(int mode)
int mouseY;
mouseGetPositionInWindow(gLoadSaveWindow, &mouseX, &mouseY);
int clickedSlot = (mouseY - 79) / (3 * fontGetLineHeight() + 4);
//int clickedSlot = (mouseY - 79) / (3 * fontGetLineHeight() + 4);
int clickedSlot = (mouseY - 79) / (3 * 10 + 4);
if (clickedSlot < 0) {
clickedSlot = 0;
} else if (clickedSlot > 9) {
@ -2042,7 +2044,8 @@ static void _ShowSlotList(int windowType)
snprintf(_str, sizeof(_str), "[ %s %.2d: ]", text, index + 1);
fontDrawText(gLoadSaveWindowBuffer + LS_WINDOW_WIDTH * y + 55, _str, LS_WINDOW_WIDTH, LS_WINDOW_WIDTH, color);
y += fontGetLineHeight();
y += 10;
//fontGetLineHeight();
switch (_LSstatus[index]) {
case SLOT_STATE_OCCUPIED:
strcpy(_str, _LSData[index].description);
@ -2067,7 +2070,8 @@ static void _ShowSlotList(int windowType)
}
fontDrawText(gLoadSaveWindowBuffer + LS_WINDOW_WIDTH * y + 55, _str, LS_WINDOW_WIDTH, LS_WINDOW_WIDTH, color);
y += 2 * fontGetLineHeight() + 4;
//y += 2 * fontGetLineHeight() + 4;
y += 2 * 10 + 4;
}
}
@ -2094,7 +2098,8 @@ static void _DrawInfoBox(int slot)
ptr->gameYear,
100 * ((ptr->gameTime / 600) / 60 % 24) + (ptr->gameTime / 600) % 60);
int v2 = fontGetLineHeight();
int v2 = 10;
//fontGetLineHeight();
fontDrawText(gLoadSaveWindowBuffer + LS_WINDOW_WIDTH * (256 + v2) + 397, _str, LS_WINDOW_WIDTH, LS_WINDOW_WIDTH, color);
snprintf(_str,
@ -2303,7 +2308,8 @@ static int _get_input_str2(int win, int doneKeyCode, int cancelKeyCode, char* de
{
int cursorWidth = fontGetStringWidth("_") - 4;
int windowWidth = windowGetWidth(win);
int lineHeight = fontGetLineHeight();
int lineHeight = 10;
//fontGetLineHeight();
unsigned char* windowBuffer = windowGetBuffer(win);
if (maxLength > 255) {
maxLength = 255;

55
src/pipboy.cc
View File

@ -396,6 +396,10 @@ static int gPipboyPrevTab;
static FrmImage _pipboyFrmImages[PIPBOY_FRM_COUNT];
static int pipboyLineMax()
{
return PIPBOY_HOLODISK_LINES_MAX * 10 / fontGetLineHeight();
}
// 0x497004
int pipboyOpen(int intent)
{
@ -506,7 +510,8 @@ static int pipboyWindowInit(int intent)
_rest_time = 0;
gPipboyCurrentLine = 0;
gPipboyWindowButtonCount = 0;
gPipboyLinesCount = PIPBOY_WINDOW_CONTENT_VIEW_HEIGHT / fontGetLineHeight() - 1;
//gPipboyLinesCount = PIPBOY_WINDOW_CONTENT_VIEW_HEIGHT / fontGetLineHeight() - 1;
gPipboyLinesCount = PIPBOY_WINDOW_CONTENT_VIEW_HEIGHT / 10 - 1;
gPipboyWindowButtonStart = 0;
_hot_back_line = 0;
@ -808,6 +813,43 @@ static void pipboyDrawText(const char* text, int flags, int color)
left += 260 - length;
}
//fontDrawText(gPipboyWindowBuffer + PIPBOY_WINDOW_WIDTH * (gPipboyCurrentLine * fontGetLineHeight() + PIPBOY_WINDOW_CONTENT_VIEW_Y) + PIPBOY_WINDOW_CONTENT_VIEW_X + left, text, PIPBOY_WINDOW_WIDTH, PIPBOY_WINDOW_WIDTH, color);
fontDrawText(gPipboyWindowBuffer + PIPBOY_WINDOW_WIDTH * (gPipboyCurrentLine * 10 + PIPBOY_WINDOW_CONTENT_VIEW_Y) + PIPBOY_WINDOW_CONTENT_VIEW_X + left, text, PIPBOY_WINDOW_WIDTH, PIPBOY_WINDOW_WIDTH, color);
if ((flags & PIPBOY_TEXT_STYLE_STRIKE_THROUGH) != 0) {
//int top = gPipboyCurrentLine * fontGetLineHeight() + 49;
int top = gPipboyCurrentLine * 10 + 49;
bufferDrawLine(gPipboyWindowBuffer, PIPBOY_WINDOW_WIDTH, PIPBOY_WINDOW_CONTENT_VIEW_X + left, top, PIPBOY_WINDOW_CONTENT_VIEW_X + left + length, top, color);
}
if (gPipboyCurrentLine < gPipboyLinesCount) {
gPipboyCurrentLine += 1;
}
}
static void pipboyDrawTextLegacy(const char* text, int flags, int color)
{
if ((flags & PIPBOY_TEXT_STYLE_UNDERLINE) != 0) {
color |= FONT_UNDERLINE;
}
int left = 8;
if ((flags & PIPBOY_TEXT_NO_INDENT) != 0) {
left -= 7;
}
int length = fontGetStringWidth(text);
if ((flags & PIPBOY_TEXT_ALIGNMENT_CENTER) != 0) {
left = (350 - length) / 2;
} else if ((flags & PIPBOY_TEXT_ALIGNMENT_RIGHT_COLUMN) != 0) {
left += 175;
} else if ((flags & PIPBOY_TEXT_ALIGNMENT_LEFT_COLUMN_CENTER) != 0) {
left += 86 - length + 16;
} else if ((flags & PIPBOY_TEXT_ALIGNMENT_RIGHT_COLUMN_CENTER) != 0) {
left += 260 - length;
}
fontDrawText(gPipboyWindowBuffer + PIPBOY_WINDOW_WIDTH * (gPipboyCurrentLine * fontGetLineHeight() + PIPBOY_WINDOW_CONTENT_VIEW_Y) + PIPBOY_WINDOW_CONTENT_VIEW_X + left, text, PIPBOY_WINDOW_WIDTH, PIPBOY_WINDOW_WIDTH, color);
if ((flags & PIPBOY_TEXT_STYLE_STRIKE_THROUGH) != 0) {
@ -1274,7 +1316,7 @@ static void pipboyRenderHolodiskText()
}
linesCount += 1;
if (linesCount >= PIPBOY_HOLODISK_LINES_MAX) {
if (linesCount >= pipboyLineMax()) {
linesCount = 0;
gPipboyHolodiskLastPage += 1;
}
@ -1297,7 +1339,7 @@ static void pipboyRenderHolodiskText()
}
numberOfLines += 1;
if (numberOfLines >= PIPBOY_HOLODISK_LINES_MAX) {
if (numberOfLines >= pipboyLineMax()) {
page += 1;
if (page >= _view_page) {
break;
@ -1331,7 +1373,7 @@ static void pipboyRenderHolodiskText()
gPipboyCurrentLine = 3;
}
for (int line = 0; line < PIPBOY_HOLODISK_LINES_MAX; line += 1) {
for (int line = 0; line < pipboyLineMax(); line += 1) {
const char* text = getmsg(&gPipboyMessageList, &gPipboyMessageListItem, holodiskTextId);
if (strcmp(text, "**END-DISK**") == 0) {
break;
@ -1340,7 +1382,7 @@ static void pipboyRenderHolodiskText()
if (strcmp(text, "**END-PAR**") == 0) {
gPipboyCurrentLine += 1;
} else {
pipboyDrawText(text, PIPBOY_TEXT_NO_INDENT, _colorTable[992]);
pipboyDrawTextLegacy(text, PIPBOY_TEXT_NO_INDENT, _colorTable[992]);
}
holodiskTextId += 1;
@ -1896,7 +1938,8 @@ static void pipboyWindowCreateButtons(int start, int count, bool a3)
{
fontSetCurrent(101);
int height = fontGetLineHeight();
//int height = fontGetLineHeight();
int height = 10;
gPipboyWindowButtonStart = start;
gPipboyWindowButtonCount = count;

6
src/text_font.cc
View File

@ -8,6 +8,8 @@
#include "memory.h"
#include "platform_compat.h"
#include "word_wrap.h"
namespace fallout {
// The maximum number of text fonts.
@ -62,6 +64,7 @@ FontManager gTextFontManager = {
textFontGetLetterSpacingImpl,
textFontGetBufferSizeImpl,
textFontGetMonospacedCharacterWidthImpl,
leagcyWordWrap,
};
// 0x51E3B0
@ -94,6 +97,7 @@ FontManagerGetBufferSizeProc* fontGetBufferSize = NULL;
// 0x51E3D4
FontManagerGetMonospacedCharacterWidth* fontGetMonospacedCharacterWidth = NULL;
FontManageWordWrapProc* wordWrap = NULL;
// 0x6ADB08
static TextFontDescriptor gTextFontDescriptors[TEXT_FONT_MAX];
@ -281,6 +285,7 @@ void fontSetCurrent(int font)
fontGetLetterSpacing = fontManager->getLetterSpacingProc;
fontGetBufferSize = fontManager->getBufferSizeProc;
fontGetMonospacedCharacterWidth = fontManager->getMonospacedCharacterWidthProc;
wordWrap = fontManager->wordWrap;
gCurrentFont = font;
@ -427,5 +432,4 @@ static int textFontGetMonospacedCharacterWidthImpl()
return width + gCurrentTextFontDescriptor->letterSpacing;
}
} // namespace fallout

6
src/text_font.h
View File

@ -13,6 +13,8 @@ typedef int FontManagerGetLetterSpacingProc();
typedef int FontManagerGetBufferSizeProc(const char* string);
typedef int FontManagerGetMonospacedCharacterWidth();
typedef int FontManageWordWrapProc(const char* string, int width, short* breakpoints, short* breakpointsLengthPtr);
typedef struct FontManager {
int minFont;
int maxFont;
@ -25,6 +27,8 @@ typedef struct FontManager {
FontManagerGetLetterSpacingProc* getLetterSpacingProc;
FontManagerGetBufferSizeProc* getBufferSizeProc;
FontManagerGetMonospacedCharacterWidth* getMonospacedCharacterWidthProc;
FontManageWordWrapProc* wordWrap;
} FontManager;
#define FONT_SHADOW (0x10000)
@ -43,6 +47,8 @@ extern FontManagerGetLetterSpacingProc* fontGetLetterSpacing;
extern FontManagerGetBufferSizeProc* fontGetBufferSize;
extern FontManagerGetMonospacedCharacterWidth* fontGetMonospacedCharacterWidth;
extern FontManageWordWrapProc* wordWrap;
int textFontsInit();
void textFontsExit();
int textFontLoad(int font);

2
src/word_wrap.cc
View File

@ -9,7 +9,7 @@
namespace fallout {
// 0x4BC6F0
int wordWrap(const char* string, int width, short* breakpoints, short* breakpointsLengthPtr)
extern int leagcyWordWrap(const char* string, int width, short* breakpoints, short* breakpointsLengthPtr)
{
breakpoints[0] = 0;
*breakpointsLengthPtr = 1;

2
src/word_wrap.h
View File

@ -5,7 +5,7 @@ namespace fallout {
#define WORD_WRAP_MAX_COUNT (64)
int wordWrap(const char* string, int width, short* breakpoints, short* breakpointsLengthPtr);
extern int leagcyWordWrap(const char* string, int width, short* breakpoints, short* breakpointsLengthPtr);
} // namespace fallout

28
third_party/freetype/CMakeLists.txt vendored Normal file
View File

@ -0,0 +1,28 @@
SET(BUILD_SHARED_LIBS FALSE)
SET(FT_DISABLE_HARFBUZZ ON)
SET(FT_DISABLE_PNG ON)
SET(FT_DISABLE_BROTLI ON)
SET(FT_DISABLE_BZIP2 ON)
SET(FT_DISABLE_ZLIB ON)
SET(FT_CONFIG_OPTION_USE_ZLIB OFF)
include(FetchContent)
FetchContent_Declare(freetype
GIT_REPOSITORY "https://github.com/freetype/freetype"
GIT_TAG "VER-2-12-1"
)
FetchContent_GetProperties(freetype)
if (NOT freetype_POPULATED)
FetchContent_Populate(freetype)
endif()
add_subdirectory(${freetype_SOURCE_DIR} ${freetype_BINARY_DIR} EXCLUDE_FROM_ALL)
set(FREETYPE_LIBRARIES "freetype" PARENT_SCOPE)
set(FREETYPE_INCLUDE_DIRS ${freetype_SOURCE_DIR} ${freetype_BINARY_DIR} PARENT_SCOPE)
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/ftoption.h" ORIGINAL_FTOPTION_H)
file(WRITE "${freetype_BINARY_DIR}/include/freetype/config/ftoption.h" "${ORIGINAL_FTOPTION_H}")

1029
third_party/freetype/ftoption.h vendored Normal file
View File

File diff suppressed because it is too large Load Diff

19
third_party/iconv/CMakeLists.txt vendored Normal file
View File

@ -0,0 +1,19 @@
include(FetchContent)
FetchContent_Declare(iconv
GIT_REPOSITORY "https://github.com/sonilyan/libiconv_for_fallout2ce.git"
)
FetchContent_GetProperties(iconv)
if (NOT iconv_POPULATED)
FetchContent_Populate(iconv)
endif()
add_subdirectory(${iconv_SOURCE_DIR} ${iconv_BINARY_DIR} EXCLUDE_FROM_ALL)
set(ICONV_LIBRARIES "iconv-static" PARENT_SCOPE)
set(ICONV_INCLUDE_DIRS ${iconv_SOURCE_DIR} ${iconv_BINARY_DIR}/include PARENT_SCOPE)