From eec27960ea01cfdc3678c8ee9104b61266990b26 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Sat, 8 Feb 2014 14:37:59 +0000 Subject: [PATCH] Lunatic: update dynsymlists. Move blendtable[] from build.h to engine.c. BUILD_LUNATIC. git-svn-id: https://svn.eduke32.com/eduke32@4309 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/include/build.h | 1 - polymer/eduke32/build/src/engine.c | 3 ++- polymer/eduke32/source/lunatic/dynsymlist | 4 +++- polymer/eduke32/source/lunatic/dynsymlist_m32 | 4 +++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/polymer/eduke32/build/include/build.h b/polymer/eduke32/build/include/build.h index 74d2e9420..b9961f4e2 100644 --- a/polymer/eduke32/build/include/build.h +++ b/polymer/eduke32/build/include/build.h @@ -761,7 +761,6 @@ EXTERN int16_t sintable[2048]; EXTERN uint8_t palette[768]; EXTERN int16_t numshades; EXTERN char *palookup[MAXPALOOKUPS]; -EXTERN char *blendtable[MAXBLENDTABS]; EXTERN uint8_t **basepaltableptr; EXTERN char showinvisibility; EXTERN int32_t g_visibility, parallaxvisibility; diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c index dec0d7382..8a2772e93 100644 --- a/polymer/eduke32/build/src/engine.c +++ b/polymer/eduke32/build/src/engine.c @@ -2470,6 +2470,7 @@ char palfadedelta = 0; // Internal Engine Functions // +static char *blendtable[MAXBLENDTABS]; #define getblendtab(blend) (blendtable[blend]) static void setpalettefade_calc(uint8_t offset); @@ -14694,7 +14695,7 @@ void setblendtab(int32_t blend, const char *tab) { if (blendtable[blend] == NULL) { - blendtable[blend] = Bmalloc(256*256); + blendtable[blend] = (char *)Bmalloc(256*256); if (blendtable[blend] == NULL) exit(1); } diff --git a/polymer/eduke32/source/lunatic/dynsymlist b/polymer/eduke32/source/lunatic/dynsymlist index 6525a16a3..b2a2798bc 100644 --- a/polymer/eduke32/source/lunatic/dynsymlist +++ b/polymer/eduke32/source/lunatic/dynsymlist @@ -66,9 +66,11 @@ clipmovex; rotatesprite_; setaspect; -getclosestcol; +getclosestcol_lim; palookup; palette; +getblendtab; +setblendtab; setpalookup; kopen4load; diff --git a/polymer/eduke32/source/lunatic/dynsymlist_m32 b/polymer/eduke32/source/lunatic/dynsymlist_m32 index 42e1080fe..7768097ed 100644 --- a/polymer/eduke32/source/lunatic/dynsymlist_m32 +++ b/polymer/eduke32/source/lunatic/dynsymlist_m32 @@ -66,9 +66,11 @@ clipmovex; rotatesprite_; setaspect; -getclosestcol; +getclosestcol_lim; palookup; palette; +getblendtab; +setblendtab; setpalookup; kopen4load;