teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-16 01:11:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix minor help text formatting issues in shadexfog.lua.

Browse source 
Also, fix saving PALETTE.DAT tables without lognumalphatabs byte. DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4429 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2014-04-10 18:44:31 +00:00
parent 63fee16ca5
commit a7cc0741ae
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
polymer/eduke32/source/lunatic/engine.lua
View file

@ -314,8 +314,10 @@ if (ismapster32) then
local blendnumtab, blendptrtab = validate_more_blendtabs( local blendnumtab, blendptrtab = validate_more_blendtabs(
moreblends, "blending", C.getblendtab) moreblends, "blending", C.getblendtab)
if (not (type(lognumalphatabs)=="number" and lognumalphatabs >= 1 and lognumalphatabs <= 7)) then if (lognumalphatabs ~= nil) then
error("invalid argument #5: must be a number in [1 .. 7]", 2) if (not (type(lognumalphatabs)=="number" and lognumalphatabs >= 1 and lognumalphatabs <= 7)) then
error("invalid argument #5: must be a number in [1 .. 7]", 2)
end
end end
local f, errmsg = io.open(filename, "wb+") local f, errmsg = io.open(filename, "wb+")
@ -343,7 +345,7 @@ if (ismapster32) then
end end
end end
if (lognumalphatabs) then if (lognumalphatabs ~= nil) then
-- XXX: no checking whether these blending tables 1 to -- XXX: no checking whether these blending tables 1 to
-- 1<<lognumalphatabs have been written. -- 1<<lognumalphatabs have been written.
f:write(string.char(lognumalphatabs)) f:write(string.char(lognumalphatabs))

8
polymer/eduke32/source/lunatic/test/shadexfog.lua
View file

@ -678,8 +678,8 @@ formatHelp
<shadexfog.createremap(palnum, remaptab)> <shadexfog.createremap(palnum, remaptab)>
<_______________________________________> <_______________________________________>
Creates a color index remapping expressed as mappings of sexdecatuples Creates a color index remapping expressed as mappings of sexdeca-
(16-tuples) of the base palette at pal <palnum>. tuples (16-tuples) of the base palette at pal <palnum>.
Duke3D's default base palette can be considered to consist of six Duke3D's default base palette can be considered to consist of six
ramps of 32 colors each, three ramps of 16 colors each and a ramps of 32 colors each, three ramps of 16 colors each and a
@ -754,8 +754,8 @@ Finally, you are asked to specify additional blending tables that can
be stored in EDuke32's extended PALETTE.DAT format. If one or more be stored in EDuke32's extended PALETTE.DAT format. If one or more
additional blending table is specified, you are also queried for the additional blending table is specified, you are also queried for the
log2 of the last alpha blending table index, <lognumalpha>. Since alpha log2 of the last alpha blending table index, <lognumalpha>. Since alpha
blending tables are assumed to be set up at indices 1 to 2^<lognumalpha>, blending tables are assumed to be set up at indices 1 to
it is also the log2 of their total count. exp(2, <lognumalpha>), it is also the log2 of their total count.
]] ]]
) )