From a7cc0741ae691b8d161d30f45b456ba46f5d55d6 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Thu, 10 Apr 2014 18:44:31 +0000 Subject: [PATCH] Fix minor help text formatting issues in shadexfog.lua. 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 --- polymer/eduke32/source/lunatic/engine.lua | 8 +++++--- polymer/eduke32/source/lunatic/test/shadexfog.lua | 8 ++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/polymer/eduke32/source/lunatic/engine.lua b/polymer/eduke32/source/lunatic/engine.lua index 2216449ea..4b5c6b5f6 100644 --- a/polymer/eduke32/source/lunatic/engine.lua +++ b/polymer/eduke32/source/lunatic/engine.lua @@ -314,8 +314,10 @@ if (ismapster32) then local blendnumtab, blendptrtab = validate_more_blendtabs( moreblends, "blending", C.getblendtab) - if (not (type(lognumalphatabs)=="number" and lognumalphatabs >= 1 and lognumalphatabs <= 7)) then - error("invalid argument #5: must be a number in [1 .. 7]", 2) + if (lognumalphatabs ~= nil) then + 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 local f, errmsg = io.open(filename, "wb+") @@ -343,7 +345,7 @@ if (ismapster32) then end end - if (lognumalphatabs) then + if (lognumalphatabs ~= nil) then -- XXX: no checking whether these blending tables 1 to -- 1< <_______________________________________> -Creates a color index remapping expressed as mappings of sexdecatuples -(16-tuples) of the base palette at pal . +Creates a color index remapping expressed as mappings of sexdeca- +tuples (16-tuples) of the base palette at pal . 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 @@ -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 additional blending table is specified, you are also queried for the log2 of the last alpha blending table index, . Since alpha -blending tables are assumed to be set up at indices 1 to 2^, -it is also the log2 of their total count. +blending tables are assumed to be set up at indices 1 to +exp(2, ), it is also the log2 of their total count. ]] )