From 40c704babe5c412da6a3761874369377fe705d47 Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sun, 3 May 2015 07:04:11 +0000
Subject: [PATCH] Separate kpzload into two separate functions, kpzbufload
 (which now lives in cache1d, regardless of WITHKPLIB) and kpzdecode.

git-svn-id: https://svn.eduke32.com/eduke32@5175 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/build/include/cache1d.h |  6 +++--
 polymer/eduke32/build/include/kplib.h   |  1 +
 polymer/eduke32/build/src/cache1d.c     | 36 ++++++++++++++++++++++---
 polymer/eduke32/build/src/engine.c      |  2 --
 polymer/eduke32/build/src/kplib.c       | 35 ++++++++++++------------
 5 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/polymer/eduke32/build/include/cache1d.h b/polymer/eduke32/build/include/cache1d.h
index 5e3932845..4c9473109 100644
--- a/polymer/eduke32/build/include/cache1d.h
+++ b/polymer/eduke32/build/include/cache1d.h
@@ -12,10 +12,12 @@ extern "C" {
 
 #ifdef WITHKPLIB
 int32_t cache1d_file_fromzip(int32_t fil);
-extern char *kpzbuf;
-extern int32_t kpzbufsiz;
 #endif
 
+extern char *kpzbuf;
+extern int32_t kpzbufloadfil(int32_t);
+extern int32_t kpzbufload(const char *);
+
 void	initcache(intptr_t dacachestart, int32_t dacachesize);
 void	allocache(intptr_t *newhandle, int32_t newbytes, char *newlockptr);
 void	agecache(void);
diff --git a/polymer/eduke32/build/include/kplib.h b/polymer/eduke32/build/include/kplib.h
index 78a663a33..43601c6ac 100644
--- a/polymer/eduke32/build/include/kplib.h
+++ b/polymer/eduke32/build/include/kplib.h
@@ -25,6 +25,7 @@ typedef struct
 extern kzfilestate kzfs;
 
 	//High-level (easy) picture loading function:
+extern void kpzdecode (int32_t, intptr_t *, int32_t *, int32_t *, int32_t *);
 extern void kpzload (const char *, intptr_t *, int32_t *, int32_t *, int32_t *);
 	//Low-level PNG/JPG functions:
 extern void kpgetdim (const char *, int32_t, int32_t *, int32_t *);
diff --git a/polymer/eduke32/build/src/cache1d.c b/polymer/eduke32/build/src/cache1d.c
index 8078d9fd8..1c41632f4 100644
--- a/polymer/eduke32/build/src/cache1d.c
+++ b/polymer/eduke32/build/src/cache1d.c
@@ -40,9 +40,6 @@
 #ifdef WITHKPLIB
 #include "kplib.h"
 
-char *kpzbuf = NULL;
-int32_t kpzbufsiz = 0;
-
 //Insert '|' in front of filename
 //Doing this tells kzopen to load the file only if inside a .ZIP file
 static intptr_t kzipopen(const char *filnam)
@@ -58,6 +55,39 @@ static intptr_t kzipopen(const char *filnam)
 
 #endif
 
+char *kpzbuf = NULL;
+
+int32_t kpzbufloadfil(int32_t const handle)
+{
+    static int32_t kpzbufsiz = 0;
+
+    int32_t const leng = kfilelength(handle);
+    if (leng > kpzbufsiz)
+    {
+        kpzbuf = (char *) Xrealloc(kpzbuf, leng+1);
+        kpzbufsiz = leng;
+        if (!kpzbuf)
+            return 0;
+    }
+
+    kpzbuf[leng] = 0;  // FIXME: buf[leng] read in kpegrend(), see BUF_LENG_READ
+    kread(handle, kpzbuf, leng);
+
+    return leng;
+}
+
+int32_t kpzbufload(char const * const filnam)
+{
+    int32_t const handle = kopen4load(filnam, 0);
+    if (handle < 0)
+        return 0;
+
+    int32_t const leng = kpzbufloadfil(handle);
+
+    kclose(handle);
+
+    return leng;
+}
 
 //   This module keeps track of a standard linear cacheing system.
 //   To use this module, here's all you need to do:
diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c
index 61e5f49fc..80ee5e832 100644
--- a/polymer/eduke32/build/src/engine.c
+++ b/polymer/eduke32/build/src/engine.c
@@ -9272,9 +9272,7 @@ void uninitengine(void)
 #ifdef DYNALLOC_ARRAYS
     DO_FREE_AND_NULL(blockptr);
 #endif
-#ifdef WITHKPLIB
     DO_FREE_AND_NULL(kpzbuf);
-#endif
 
     uninitsystem();
 
diff --git a/polymer/eduke32/build/src/kplib.c b/polymer/eduke32/build/src/kplib.c
index 26ce63f8b..13c45d229 100644
--- a/polymer/eduke32/build/src/kplib.c
+++ b/polymer/eduke32/build/src/kplib.c
@@ -3061,28 +3061,29 @@ int32_t kzseek(int32_t offset, int32_t whence)
 //===================== HANDY PICTURE function begins ========================
 #include "cache1d.h"
 
-void kpzload(const char *filnam, intptr_t *pic, int32_t *bpl, int32_t *xsiz, int32_t *ysiz)
+void kpzdecode(int32_t const leng, intptr_t * const pic, int32_t * const bpl, int32_t * const xsiz, int32_t * const ysiz)
 {
-    int32_t leng;
-    int32_t handle = kopen4load((char *)filnam, 0);
+    *pic = 0;
 
-    (*pic) = 0;
-    if (handle < 0) return;
-    leng = kfilelength(handle);
+    kpgetdim(kpzbuf, leng, xsiz, ysiz);
+    *bpl = (*xsiz)<<2;
 
-    if (leng+1 > kpzbufsiz)
+    *pic = (intptr_t)Xmalloc(*ysiz * *bpl);
+    if (!*pic)
+        return;
+
+    if (kprender(kpzbuf, leng, *pic, *bpl, *xsiz, *ysiz) < 0)
     {
-        kpzbuf = (char *) Xrealloc(kpzbuf, leng+1);
-        kpzbufsiz = leng+1;
-        if (!kpzbuf) { kclose(handle); return; }
+        if (*pic)
+        {
+            Bfree((void *) *pic);
+            *pic = 0;
+        }
     }
-    kpzbuf[leng]=0;  // FIXME: buf[leng] read in kpegrend(), see BUF_LENG_READ
-    kread(handle,kpzbuf,leng);
-    kclose(handle);
+}
 
-    kpgetdim(kpzbuf,leng,xsiz,ysiz);
-    (*bpl) = ((*xsiz)<<2);
-    (*pic) = (intptr_t)Xmalloc((*ysiz)*(*bpl)); if (!(*pic)) { return; }
-    if (kprender(kpzbuf, leng, *pic, *bpl, *xsiz, *ysiz) < 0) { if (*pic) { Bfree((void *) *pic), *pic = 0; return; } }
+void kpzload(const char * const filnam, intptr_t * const pic, int32_t * const bpl, int32_t * const xsiz, int32_t * const ysiz)
+{
+    kpzdecode(kpzbufload(filnam), pic, bpl, xsiz, ysiz);
 }
 //====================== HANDY PICTURE function ends =========================