From bcadbd372b41c403644681f30b417bae2f0ddeb7 Mon Sep 17 00:00:00 2001 From: terminx Date: Sat, 26 Feb 2011 23:38:18 +0000 Subject: [PATCH] MSVC build fix git-svn-id: https://svn.eduke32.com/eduke32@1806 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/src/build.c | 7 +++---- polymer/eduke32/source/astub.c | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/polymer/eduke32/build/src/build.c b/polymer/eduke32/build/src/build.c index 7024b3f1c..4830d2492 100644 --- a/polymer/eduke32/build/src/build.c +++ b/polymer/eduke32/build/src/build.c @@ -1646,7 +1646,7 @@ void update_highlightsector() } // hook run after handleevents in side view -static void sideview_filter_keys() +static void sideview_filter_keys(void) { uint32_t i; @@ -1758,10 +1758,9 @@ static void fade_screen() static void copy_some_wall_members(int16_t dst, int16_t src) { - static const walltype nullwall = { .yrepeat=8, .extra=-1 }; + static const walltype nullwall = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, -1 }; walltype *dstwal=&wall[dst]; - const walltype *srcwal; - srcwal = src>=0 ? &wall[src] : &nullwall; + const walltype *srcwal = src >= 0 ? &wall[src] : &nullwall; dstwal->cstat = srcwal->cstat; dstwal->shade = srcwal->shade; diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c index aeb04ae59..7d37fc848 100644 --- a/polymer/eduke32/source/astub.c +++ b/polymer/eduke32/source/astub.c @@ -7838,7 +7838,7 @@ static int32_t osdcmd_vars_pk(const osdfuncparm_t *parm) } else if (tryfix) { - uint64_t whicherrs = parm->numparms==1 ? ULONG_LONG_MAX : 0; + uint64_t whicherrs = parm->numparms==1 ? 0xffffffffffffffffull : 0; if (whicherrs==0) { @@ -7854,7 +7854,7 @@ static int32_t osdcmd_vars_pk(const osdfuncparm_t *parm) m = (int32_t)Bstrtol(endptr+1, NULL, 10); if (n>=1 && n<=m && m<=MAXCORRUPTTHINGS) { - uint64_t mask = ULONG_LONG_MAX; + uint64_t mask = 0xffffffffffffffffull; m = m-n+1; mask >>= (MAXCORRUPTTHINGS-m); mask <<= (n-1);