From 150678ce7bf3c7a8b55832814802cebaf8f811e1 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sun, 14 Mar 2010 11:15:53 +0000
Subject: [PATCH] git-svn-id: https://svn.eduke32.com/eduke32@1614
 1a8010ca-5511-0410-912e-c29ae57300e0

---
 polymer/eduke32/source/jmact/animlib.c | 32 ++++++++------------------
 polymer/eduke32/source/jmact/animlib.h |  7 +++---
 2 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/polymer/eduke32/source/jmact/animlib.c b/polymer/eduke32/source/jmact/animlib.c
index 6feb0d6fb..fffa742d6 100644
--- a/polymer/eduke32/source/jmact/animlib.c
+++ b/polymer/eduke32/source/jmact/animlib.c
@@ -87,9 +87,8 @@ uint16_t findpage(uint16_t framenumber)
 //
 //****************************************************************************
 
-void loadpage(uint16_t pagenumber, uint16_t *pagepointer)
+void loadpage(uint16_t pagenumber, uint16_t **pagepointer)
 {
-    int32_t size;
     uint8_t * buffer;
 
     CheckAnimStarted("loadpage");
@@ -97,20 +96,12 @@ void loadpage(uint16_t pagenumber, uint16_t *pagepointer)
     if (anim->curlpnum != pagenumber)
     {
         anim->curlpnum = pagenumber;
-        buffer += 0xb00 + (pagenumber*0x10000);
-        size = sizeof(lp_descriptor);
-        /*
-        Bmemcpy(&anim->curlp,buffer,size);
+        buffer += 0xb00 + (pagenumber*IMAGEBUFFERSIZE);
+        anim->curlp = &anim->LpArray[pagenumber];
 
-        // JBF: why didn't this get read from the LpArray[] table?
-        anim->curlp.baseRecord = B_LITTLE16(anim->curlp.baseRecord);
-        anim->curlp.nRecords   = B_LITTLE16(anim->curlp.nRecords);
-        anim->curlp.nBytes     = B_LITTLE16(anim->curlp.nBytes);
-         */
-        Bmemcpy(&anim->curlp, &anim->LpArray[pagenumber], size);
+        buffer += sizeof(lp_descriptor) + sizeof(uint16_t);
 
-        buffer += size + sizeof(uint16_t);
-        Bmemcpy(pagepointer,buffer,anim->curlp.nBytes+(anim->curlp.nRecords*2));
+        *pagepointer = (uint16_t *)buffer;
     }
 }
 
@@ -214,23 +205,18 @@ void renderframe(uint16_t framenumber, uint16_t *pagepointer)
     uint8_t *ppointer;
 
     CheckAnimStarted("renderframe");
-    destframe = framenumber - anim->curlp.baseRecord;
+    destframe = framenumber - anim->curlp->baseRecord;
 
     for (i = 0; i < destframe; i++)
-    {
         offset += B_LITTLE16(pagepointer[i]);
-    }
+
     ppointer = (uint8_t *)pagepointer;
 
-    ppointer+=anim->curlp.nRecords*2+offset;
+    ppointer+=anim->curlp->nRecords*2+offset;
     if (ppointer[1])
-    {
         ppointer += (4 + B_LITTLE16(((uint16_t *)ppointer)[1]) + (B_LITTLE16(((uint16_t *)ppointer)[1]) & 1));
-    }
     else
-    {
         ppointer+=4;
-    }
 
     CPlayRunSkipDump((uint8_t *)ppointer, (uint8_t *)anim->imagebuffer);
 }
@@ -246,7 +232,7 @@ void renderframe(uint16_t framenumber, uint16_t *pagepointer)
 void drawframe(uint16_t framenumber)
 {
     CheckAnimStarted("drawframe");
-    loadpage(findpage(framenumber), anim->thepage);
+    loadpage(findpage(framenumber), &anim->thepage);
     renderframe(framenumber, anim->thepage);
 }
 
diff --git a/polymer/eduke32/source/jmact/animlib.h b/polymer/eduke32/source/jmact/animlib.h
index 12945b589..d8493a8d1 100644
--- a/polymer/eduke32/source/jmact/animlib.h
+++ b/polymer/eduke32/source/jmact/animlib.h
@@ -88,15 +88,16 @@ typedef struct
 
 #pragma pack(pop)
 
+#define IMAGEBUFFERSIZE 0x10000
 typedef struct
    {
    uint16_t framecount;          // current frame of anim
    lpfileheader lpheader;           // file header will be loaded into this structure
    lp_descriptor LpArray[256]; // arrays of large page structs used to find frames
    uint16_t curlpnum;               // initialize to an invalid Large page number
-   lp_descriptor curlp;        // header of large page currently in memory
-   uint16_t thepage[0x8000];     // buffer where current large page is loaded
-   uint8_t imagebuffer[0x10000]; // buffer where anim frame is decoded
+   lp_descriptor * curlp;        // header of large page currently in memory
+   uint16_t * thepage;     // buffer where current large page is loaded
+   uint8_t imagebuffer[IMAGEBUFFERSIZE]; // buffer where anim frame is decoded
    uint8_t * buffer;
    uint8_t pal[768];
    int32_t  currentframe;