diff options
| -rw-r--r-- | src/heretic/f_finale.c | 4 | ||||
| -rw-r--r-- | src/heretic/r_things.c | 2 | ||||
| -rw-r--r-- | src/hexen/f_finale.c | 5 | ||||
| -rw-r--r-- | src/hexen/in_lude.c | 5 | ||||
| -rw-r--r-- | src/hexen/mn_menu.c | 2 | ||||
| -rw-r--r-- | src/hexen/r_things.c | 2 | ||||
| -rw-r--r-- | src/hexen/sb_bar.c | 7 | ||||
| -rw-r--r-- | src/strife/r_things.c | 2 |
8 files changed, 16 insertions, 13 deletions
diff --git a/src/heretic/f_finale.c b/src/heretic/f_finale.c index 14a8f403..ec357d8a 100644 --- a/src/heretic/f_finale.c +++ b/src/heretic/f_finale.c @@ -213,10 +213,10 @@ void F_TextWrite(void) } w = W_CacheLumpNum(FontABaseLump + c - 33, PU_CACHE); - if (cx + w->width > SCREENWIDTH) + if (cx + SHORT(w->width) > SCREENWIDTH) break; V_DrawPatch(cx, cy, w); - cx += w->width; + cx += SHORT(w->width); } } diff --git a/src/heretic/r_things.c b/src/heretic/r_things.c index b4cd19af..489c94bc 100644 --- a/src/heretic/r_things.c +++ b/src/heretic/r_things.c @@ -417,7 +417,7 @@ void R_DrawVisSprite(vissprite_t * vis, int x1, int x2) if (vis->footclip && !vis->psprite) { - sprbotscreen = sprtopscreen + FixedMul(patch->height << FRACBITS, + sprbotscreen = sprtopscreen + FixedMul(SHORT(patch->height) << FRACBITS, spryscale); baseclip = (sprbotscreen - FixedMul(vis->footclip << FRACBITS, spryscale)) >> FRACBITS; diff --git a/src/hexen/f_finale.c b/src/hexen/f_finale.c index c2f69a87..29789de8 100644 --- a/src/hexen/f_finale.c +++ b/src/hexen/f_finale.c @@ -24,6 +24,7 @@ #include "s_sound.h" #include <ctype.h> #include "v_video.h" +#include "i_swap.h" // MACROS ------------------------------------------------------------------ @@ -224,12 +225,12 @@ static void TextWrite(void) continue; } w = W_CacheLumpNum(FontABaseLump + c - 33, PU_CACHE); - if (cx + w->width > SCREENWIDTH) + if (cx + SHORT(w->width) > SCREENWIDTH) { break; } V_DrawPatch(cx, cy, w); - cx += w->width; + cx += SHORT(w->width); } } diff --git a/src/hexen/in_lude.c b/src/hexen/in_lude.c index 8c8b9c77..daabf497 100644 --- a/src/hexen/in_lude.c +++ b/src/hexen/in_lude.c @@ -23,6 +23,7 @@ #include "m_misc.h" #include "p_local.h" #include "v_video.h" +#include "i_swap.h" // MACROS ------------------------------------------------------------------ @@ -600,11 +601,11 @@ static void DrawHubText(void) continue; } w = W_CacheLumpNum(FontABaseLump + c - 33, PU_CACHE); - if (cx + w->width > SCREENWIDTH) + if (cx + SHORT(w->width) > SCREENWIDTH) { break; } V_DrawPatch(cx, cy, w); - cx += w->width; + cx += SHORT(w->width); } } diff --git a/src/hexen/mn_menu.c b/src/hexen/mn_menu.c index 6674a529..ff573317 100644 --- a/src/hexen/mn_menu.c +++ b/src/hexen/mn_menu.c @@ -378,7 +378,7 @@ void MN_DrTextAYellow(char *text, int x, int y) { p = W_CacheLumpNum(FontAYellowBaseLump + c - 33, PU_CACHE); V_DrawPatch(x, y, p); - x += p->width - 1; + x += SHORT(p->width) - 1; } } } diff --git a/src/hexen/r_things.c b/src/hexen/r_things.c index 7a05651a..aae6dc60 100644 --- a/src/hexen/r_things.c +++ b/src/hexen/r_things.c @@ -426,7 +426,7 @@ void R_DrawVisSprite(vissprite_t * vis, int x1, int x2) if (vis->floorclip && !vis->psprite) { - sprbotscreen = sprtopscreen + FixedMul(patch->height << FRACBITS, + sprbotscreen = sprtopscreen + FixedMul(SHORT(patch->height) << FRACBITS, spryscale); baseclip = (sprbotscreen - FixedMul(vis->floorclip, spryscale)) >> FRACBITS; diff --git a/src/hexen/sb_bar.c b/src/hexen/sb_bar.c index f79b0009..bcc5b675 100644 --- a/src/hexen/sb_bar.c +++ b/src/hexen/sb_bar.c @@ -26,6 +26,7 @@ #include "p_local.h" #include "s_sound.h" #include "v_video.h" +#include "i_swap.h" // TYPES ------------------------------------------------------------------- @@ -496,19 +497,19 @@ static void DrBNumber(signed int val, int x, int y) if (val > 99) { patch = W_CacheLumpNum(FontBNumBase + val / 100, PU_CACHE); - V_DrawShadowedPatch(xpos + 6 - patch->width / 2, y, patch); + V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2, y, patch); } val = val % 100; xpos += 12; if (val > 9 || oldval > 99) { patch = W_CacheLumpNum(FontBNumBase + val / 10, PU_CACHE); - V_DrawShadowedPatch(xpos + 6 - patch->width / 2, y, patch); + V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2, y, patch); } val = val % 10; xpos += 12; patch = W_CacheLumpNum(FontBNumBase + val, PU_CACHE); - V_DrawShadowedPatch(xpos + 6 - patch->width / 2, y, patch); + V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2, y, patch); } //========================================================================== diff --git a/src/strife/r_things.c b/src/strife/r_things.c index 2acb238c..6d37ca09 100644 --- a/src/strife/r_things.c +++ b/src/strife/r_things.c @@ -470,7 +470,7 @@ R_DrawVisSprite // villsa [STRIFE] clip sprite's feet if needed if(vis->mobjflags & MF_FEETCLIPPED) { - sprbotscreen = sprtopscreen + FixedMul(spryscale, patch->height << FRACBITS); + sprbotscreen = sprtopscreen + FixedMul(spryscale, SHORT(patch->height) << FRACBITS); clip = (sprbotscreen - FixedMul(10*FRACUNIT, spryscale)) >> FRACBITS; } else |