print_n_panic/Microtransactions64
0
0
Fork 0
mirror of https://github.com/Print-and-Panic/Microtransactions64.git synced 2026-01-21 10:17:19 -08:00
Code Issues Packages Projects Releases Wiki Activity

A few various Puppyprint bugfixes (#770)

Browse Source
This commit is contained in:
Gregory Heskett
2024-03-01 17:00:46 -05:00
committed by GitHub
parent 78747e9836
commit 8257f77c57
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/game/fasttext.c
View File

@@ -59,7 +59,7 @@ void drawSmallString_impl(Gfx **dl, int x, int y, const char* string, int r, int
while (string[i] != '\0') {
unsigned int cur_char = string[i];
s32 goddamnJMeasure = string[i] == 'j' ? -1 : 0;
s32 goddamnJMeasure;
if (cur_char == '\n') {
xPos = x;
@@ -75,7 +75,8 @@ void drawSmallString_impl(Gfx **dl, int x, int y, const char* string, int r, int
} else {
if (cur_char != ' ') {
s = computeS(cur_char);
gSPTextureRectangle(dlHead++, (xPos + 0) << 2, (yPos + 0) << 2, (xPos + 8) << 2, (yPos + 12) << 2, 0, (s << 5) - goddamnJMeasure, 0, 1 << 10, 1 << 10);
goddamnJMeasure = (s == 512) ? 1 : 0;
gSPTextureRectangle(dlHead++, (xPos + 0) << 2, (yPos + 0) << 2, (xPos + 8) << 2, (yPos + 12) << 2, 0, (s << 5) + goddamnJMeasure, 0, 1 << 10, 1 << 10);
}
xPos += fast_text_font_kerning[cur_char - ' '];
}

8
src/game/puppyprint.c
View File

@@ -1643,7 +1643,7 @@ void print_small_text(s32 x, s32 y, const char *str, s32 align, s32 amount, u8 f
}
get_char_from_byte(&textX, &textPos[0], str[i], &widthX, &spaceX, &offsetY, font);
s32 goddamnJMeasure = textX == 256 ? -1 : 0; // Hack to fix a rendering bug.
s32 goddamnJMeasure = textX == 256 ? 1 : 0; // Hack to fix a rendering bug.
if (str[i] != ' ' && str[i] != '\t') {
if (xlu != prevxlu) {
prevxlu = xlu;
@@ -1736,7 +1736,7 @@ void print_small_text_light(s32 x, s32 y, const char *str, s32 align, s32 amount
}
get_char_from_byte(&textX, &textPos[0], str[i], &widthX, &spaceX, &offsetY, font);
s32 goddamnJMeasure = textX == 256 ? -1 : 0; // Hack to fix a rendering bug.
s32 goddamnJMeasure = textX == 256 ? 1 : 0; // Hack to fix a rendering bug.
if (str[i] != ' ' && str[i] != '\t') {
if (xlu != prevxlu) {
prevxlu = xlu;
@@ -2092,7 +2092,7 @@ void render_multi_image(Texture *image, s32 x, s32 y, s32 width, s32 height, UNU
gDPLoadSync(gDisplayListHead++);
gDPLoadTextureTile(gDisplayListHead++,
image, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, height, posW, posH, ((posW + imW) - 1), ((posH + imH) - 1), 0, (G_TX_NOMIRROR | G_TX_CLAMP), (G_TX_NOMIRROR | G_TX_CLAMP), maskW, maskH, 0, 0);
image, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, height, posW, posH, ((posW + imW) - 1), ((posH + imH) - 1), 0, (G_TX_NOMIRROR | G_TX_WRAP), (G_TX_NOMIRROR | G_TX_WRAP), maskW, maskH, 0, 0);
gSPScisTextureRectangle(gDisplayListHead++,
((x + posW) << 2),
((y + posH) << 2),
@@ -2108,7 +2108,7 @@ void render_multi_image(Texture *image, s32 x, s32 y, s32 width, s32 height, UNU
posW = i * imW;
gDPLoadSync(gDisplayListHead++);
gDPLoadTextureTile(gDisplayListHead++,
image, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, height, posW, posH, ((posW + imW) - 1), (height - 1), 0, (G_TX_NOMIRROR | G_TX_CLAMP), (G_TX_NOMIRROR | G_TX_CLAMP), maskW, maskH, 0, 0);
image, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, height, posW, posH, ((posW + imW) - 1), (height - 1), 0, (G_TX_NOMIRROR | G_TX_WRAP), (G_TX_NOMIRROR | G_TX_WRAP), maskW, maskH, 0, 0);
gSPScisTextureRectangle(gDisplayListHead++,
(x + posW) << 2,
(y + posH) << 2,