zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Lunatic: rename sprite[].filler member to 'blend' on the Lua side.

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

git-svn-id: https://svn.eduke32.com/eduke32@4302 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2014-02-08 14:37:51 +00:00
parent 330b744a1b
commit a37c31cab7
6 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
polymer/eduke32/source/lunatic/con_lang.lua
View file

@ -369,7 +369,8 @@ local ActorLabels = {
pal = SP".pal", pal = SP".pal",
clipdist = SP".clipdist", clipdist = SP".clipdist",
-- filler = SP".filler", -- filler = SP".filler",
detail = SP".filler", -- NAME -- detail = SP".filler", -- NAME
blend = SP".blend",
xrepeat = SP".xrepeat", xrepeat = SP".xrepeat",
yrepeat = SP".yrepeat", yrepeat = SP".yrepeat",
xoffset = SP".xoffset", xoffset = SP".xoffset",

2
polymer/eduke32/source/lunatic/defs_common.lua
View file

@ -217,7 +217,7 @@ struct {
]]..bitint_member("UBit16", "cstat")..[[ ]]..bitint_member("UBit16", "cstat")..[[
const int16_t picnum; const int16_t picnum;
int8_t shade; int8_t shade;
uint8_t pal, clipdist, filler; uint8_t pal, clipdist, blend;
uint8_t xrepeat, yrepeat; uint8_t xrepeat, yrepeat;
int8_t xoffset, yoffset; int8_t xoffset, yoffset;
const int16_t sectnum, statnum; const int16_t sectnum, statnum;

4
polymer/eduke32/source/lunatic/engine_maptext.lua
View file

@ -90,7 +90,7 @@ local sprite_members = {
-- optional -- optional
p = "pal", p = "pal",
c = { "clipdist", 32 }, c = { "clipdist", 32 },
_ = "filler", b = "blend",
x = "xoffset", y = "yoffset", x = "xoffset", y = "yoffset",
s = "statnum", s = "statnum",
w = { "owner", -1 }, w = { "owner", -1 },
@ -98,7 +98,7 @@ local sprite_members = {
o = "lotag", i = "hitag", e = { "extra", -1 } 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 }) local sprite_default = ffi.new("const spritetype", { clipdist=32, owner=-1, extra=-1 })

2
polymer/eduke32/source/lunatic/test.lua
View file

@ -405,7 +405,7 @@ gameevent
local N=1 local N=1
for n=1,N do for n=1,N do
for i=0,gv.MAXSPRITES-1 do for i=0,gv.MAXSPRITES-1 do
sprite[i].filler = 1 sprite[i].blend = 1
end end
for i=gv.MAXSPRITES-1,0,-1 do for i=gv.MAXSPRITES-1,0,-1 do
sprite[i].shade = 1 sprite[i].shade = 1

2
polymer/eduke32/source/lunatic/util/build.lua
View file

@ -48,7 +48,7 @@ local STRUCTDEF = {
uint16_t cstat; uint16_t cstat;
int16_t picnum; int16_t picnum;
int8_t shade; int8_t shade;
uint8_t pal, clipdist, filler; uint8_t pal, clipdist, blend;
uint8_t xrepeat, yrepeat; uint8_t xrepeat, yrepeat;
int8_t xoffset, yoffset; int8_t xoffset, yoffset;
int16_t sectnum, statnum; int16_t sectnum, statnum;

2
polymer/eduke32/source/lunatic/util/map2text.lua
View file

@ -76,7 +76,7 @@ local sprite_members = {
"x", "y", "z", "x", "y", "z",
"cstat", "picnum", "cstat", "picnum",
"shade", "shade",
"pal", "clipdist", "filler", "pal", "clipdist", "blend",
"xrepeat", "yrepeat", "xrepeat", "yrepeat",
"xoffset", "yoffset", "xoffset", "yoffset",
"sectnum", "statnum", "sectnum", "statnum",