From 1bdc416e5f3422e9d1c28eac0dd6a3a23edb9a17 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Thu, 14 Feb 2013 16:02:16 +0000 Subject: [PATCH] Fix build without Ken's ZIP library (WITHKPLIB not #define'd in compat.h). git-svn-id: https://svn.eduke32.com/eduke32@3484 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/src/cache1d.c | 3 ++- polymer/eduke32/build/src/engine.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/polymer/eduke32/build/src/cache1d.c b/polymer/eduke32/build/src/cache1d.c index 85afea63e..ca6293171 100644 --- a/polymer/eduke32/build/src/cache1d.c +++ b/polymer/eduke32/build/src/cache1d.c @@ -1190,6 +1190,7 @@ CACHE1D_FIND_REC *klistpath(const char *_path, const char *mask, int32_t type) while (search); } +#ifdef WITHKPLIB if (!pathsearchmode) // next, zip files { char buf[BMAX_PATH+4]; @@ -1259,7 +1260,7 @@ CACHE1D_FIND_REC *klistpath(const char *_path, const char *mask, int32_t type) } } } - +#endif // then, grp files if (!pathsearchmode && !*path && (type & CACHE1D_FIND_FILE)) { diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c index dfa2b6eab..9723ab4fa 100644 --- a/polymer/eduke32/build/src/engine.c +++ b/polymer/eduke32/build/src/engine.c @@ -10741,8 +10741,9 @@ void loadtile(int16_t tilenume) if ((unsigned)tilenume >= (unsigned)MAXTILES) return; if ((dasiz = tilesizx[tilenume]*tilesizy[tilenume]) <= 0) return; -#ifdef WITHKPLIB i = tilefilenum[tilenume]; + +#ifdef WITHKPLIB if (artptrs[i]) // from zip { waloff[tilenume] = (intptr_t)(artptrs[i]) + tilefileoffs[tilenume];