From a37c31cab777f0e7dce6cd16173a6c12156ff11f Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sat, 8 Feb 2014 14:37:51 +0000
Subject: [PATCH] Lunatic: rename sprite[].filler member to 'blend' on the Lua
 side.

From LunaCON, remove 'detail' as alias to that member.

git-svn-id: https://svn.eduke32.com/eduke32@4302 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/lunatic/con_lang.lua       | 3 ++-
 polymer/eduke32/source/lunatic/defs_common.lua    | 2 +-
 polymer/eduke32/source/lunatic/engine_maptext.lua | 4 ++--
 polymer/eduke32/source/lunatic/test.lua           | 2 +-
 polymer/eduke32/source/lunatic/util/build.lua     | 2 +-
 polymer/eduke32/source/lunatic/util/map2text.lua  | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/polymer/eduke32/source/lunatic/con_lang.lua b/polymer/eduke32/source/lunatic/con_lang.lua
index 8cf801676..c819b4a99 100644
--- a/polymer/eduke32/source/lunatic/con_lang.lua
+++ b/polymer/eduke32/source/lunatic/con_lang.lua
@@ -369,7 +369,8 @@ local ActorLabels = {
     pal = SP".pal",
     clipdist = SP".clipdist",
 --    filler = SP".filler",
-    detail = SP".filler",  -- NAME
+--    detail = SP".filler",  -- NAME
+    blend = SP".blend",
     xrepeat = SP".xrepeat",
     yrepeat = SP".yrepeat",
     xoffset = SP".xoffset",
diff --git a/polymer/eduke32/source/lunatic/defs_common.lua b/polymer/eduke32/source/lunatic/defs_common.lua
index 178dd4b5f..c66939214 100644
--- a/polymer/eduke32/source/lunatic/defs_common.lua
+++ b/polymer/eduke32/source/lunatic/defs_common.lua
@@ -217,7 +217,7 @@ struct {
 ]]..bitint_member("UBit16", "cstat")..[[
     const int16_t picnum;
     int8_t shade;
-    uint8_t pal, clipdist, filler;
+    uint8_t pal, clipdist, blend;
     uint8_t xrepeat, yrepeat;
     int8_t xoffset, yoffset;
     const int16_t sectnum, statnum;
diff --git a/polymer/eduke32/source/lunatic/engine_maptext.lua b/polymer/eduke32/source/lunatic/engine_maptext.lua
index c6ddd8099..1307163c6 100644
--- a/polymer/eduke32/source/lunatic/engine_maptext.lua
+++ b/polymer/eduke32/source/lunatic/engine_maptext.lua
@@ -90,7 +90,7 @@ local sprite_members = {
     -- optional
     p = "pal",
     c = { "clipdist", 32 },
-    _ = "filler",
+    b = "blend",
     x = "xoffset", y = "yoffset",
     s = "statnum",
     w = { "owner", -1 },
@@ -98,7 +98,7 @@ local sprite_members = {
     o = "lotag", i = "hitag", e = { "extra", -1 }
 }
 
-local sprite_ord = { mand="123 4 5 6 7 8 90 ", opt="p c _ xy s w XYZ oie" }
+local sprite_ord = { mand="123 4 5 6 7 8 90 ", opt="p c b xy s w XYZ oie" }
 local sprite_default = ffi.new("const spritetype", { clipdist=32, owner=-1, extra=-1 })
 
 
diff --git a/polymer/eduke32/source/lunatic/test.lua b/polymer/eduke32/source/lunatic/test.lua
index d4b0f1349..7124922de 100644
--- a/polymer/eduke32/source/lunatic/test.lua
+++ b/polymer/eduke32/source/lunatic/test.lua
@@ -405,7 +405,7 @@ gameevent
             local N=1
             for n=1,N do
                 for i=0,gv.MAXSPRITES-1 do
-                    sprite[i].filler = 1
+                    sprite[i].blend = 1
                 end
                 for i=gv.MAXSPRITES-1,0,-1 do
                     sprite[i].shade = 1
diff --git a/polymer/eduke32/source/lunatic/util/build.lua b/polymer/eduke32/source/lunatic/util/build.lua
index 4db852b31..aaf3cd835 100644
--- a/polymer/eduke32/source/lunatic/util/build.lua
+++ b/polymer/eduke32/source/lunatic/util/build.lua
@@ -48,7 +48,7 @@ local STRUCTDEF = {
     uint16_t cstat;
     int16_t picnum;
     int8_t shade;
-    uint8_t pal, clipdist, filler;
+    uint8_t pal, clipdist, blend;
     uint8_t xrepeat, yrepeat;
     int8_t xoffset, yoffset;
     int16_t sectnum, statnum;
diff --git a/polymer/eduke32/source/lunatic/util/map2text.lua b/polymer/eduke32/source/lunatic/util/map2text.lua
index f8d486f91..2fba2b132 100755
--- a/polymer/eduke32/source/lunatic/util/map2text.lua
+++ b/polymer/eduke32/source/lunatic/util/map2text.lua
@@ -76,7 +76,7 @@ local sprite_members = {
     "x", "y", "z",
     "cstat", "picnum",
     "shade",
-    "pal", "clipdist", "filler",
+    "pal", "clipdist", "blend",
     "xrepeat", "yrepeat",
     "xoffset", "yoffset",
     "sectnum", "statnum",