summaryrefslogtreecommitdiff
path: root/src/heretic
diff options
context:
space:
mode:
Diffstat (limited to 'src/heretic')
-rw-r--r--src/heretic/Makefile.am8
-rw-r--r--src/heretic/in_lude.c12
2 files changed, 10 insertions, 10 deletions
diff --git a/src/heretic/Makefile.am b/src/heretic/Makefile.am
index bf834733..88ccc7b8 100644
--- a/src/heretic/Makefile.am
+++ b/src/heretic/Makefile.am
@@ -1,6 +1,6 @@
-AM_CFLAGS=-I.. \
- -I$(top_builddir)/textscreen \
+AM_CFLAGS=-I$(top_srcdir)/src \
+ -I$(top_srcdir)/textscreen \
@SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
noinst_LIBRARIES=libheretic.a
@@ -51,11 +51,11 @@ r_segs.c \
r_things.c \
sb_bar.c \
sounds.c sounds.h \
-s_sound.c s_sound.h
+s_sound.c s_sound.h
EXTRA_DIST= \
i_sound.c \
-i_ibm.c
+i_ibm.c
FEATURE_DEHACKED_SOURCE_FILES = \
deh_ammo.c \
diff --git a/src/heretic/in_lude.c b/src/heretic/in_lude.c
index 2314a52b..e6fc1b13 100644
--- a/src/heretic/in_lude.c
+++ b/src/heretic/in_lude.c
@@ -1004,14 +1004,14 @@ void IN_DrawNumber(int val, int x, int y, int digits)
if (digits == 4)
{
patch = FontBNumbers[val / 1000];
- V_DrawShadowedPatch(xpos + 6 - patch->width / 2 - 12, y, patch);
+ V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2 - 12, y, patch);
}
if (digits > 2)
{
if (realdigits > 2)
{
patch = FontBNumbers[val / 100];
- V_DrawShadowedPatch(xpos + 6 - patch->width / 2, y, patch);
+ V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2, y, patch);
}
xpos += 12;
}
@@ -1021,7 +1021,7 @@ void IN_DrawNumber(int val, int x, int y, int digits)
if (val > 9)
{
patch = FontBNumbers[val / 10];
- V_DrawShadowedPatch(xpos + 6 - patch->width / 2, y, patch);
+ V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2, y, patch);
}
else if (digits == 2 || oldval > 99)
{
@@ -1031,11 +1031,11 @@ void IN_DrawNumber(int val, int x, int y, int digits)
}
val = val % 10;
patch = FontBNumbers[val];
- V_DrawShadowedPatch(xpos + 6 - patch->width / 2, y, patch);
+ V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2, y, patch);
if (neg)
{
patch = FontBNegative;
- V_DrawShadowedPatch(xpos + 6 - patch->width / 2 - 12 * (realdigits),
+ V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2 - 12 * (realdigits),
y, patch);
}
}
@@ -1061,7 +1061,7 @@ void IN_DrTextB(char *text, int x, int y)
{
p = W_CacheLumpNum(FontBLump + c - 33, PU_CACHE);
V_DrawShadowedPatch(x, y, p);
- x += p->width - 1;
+ x += SHORT(p->width) - 1;
}
}
}