summaryrefslogtreecommitdiff
path: root/src/hexen
diff options
context:
space:
mode:
authorFabian Greffrath2014-12-18 10:59:47 +0100
committerFabian Greffrath2014-12-18 10:59:47 +0100
commite7abef98528ee0746b72f8089e0ad9e7a01e7755 (patch)
treeb98a873f4a4466d4410ecd15603f4b8f7badba82 /src/hexen
parentea5f633fe42c7693e30106a306b376ec169a4809 (diff)
downloadchocolate-doom-e7abef98528ee0746b72f8089e0ad9e7a01e7755.tar.gz
chocolate-doom-e7abef98528ee0746b72f8089e0ad9e7a01e7755.tar.bz2
chocolate-doom-e7abef98528ee0746b72f8089e0ad9e7a01e7755.zip
fix some more endianess issues with the width fields in patch_t structs
as pointed out necessary by Ronald Lasmanowicz for his Wii ports
Diffstat (limited to 'src/hexen')
-rw-r--r--src/hexen/f_finale.c5
-rw-r--r--src/hexen/in_lude.c5
-rw-r--r--src/hexen/mn_menu.c2
-rw-r--r--src/hexen/sb_bar.c7
4 files changed, 11 insertions, 8 deletions
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/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);
}
//==========================================================================