Fixed, Visual mode: GLDEFS glow effects should not affect 3d floor brightness.

Updated ZDoom ACC and ZDoom_ACS.cfg (added GetInventoryMax()).
This commit is contained in:
MaxED 2015-12-24 11:59:37 +00:00
parent f3fbf241d9
commit dc3d4064a1
4 changed files with 17 additions and 11 deletions

View file

@ -336,6 +336,7 @@ special
-90:GetActorRoll(1), -90:GetActorRoll(1),
-91:QuakeEx(8,12), -91:QuakeEx(8,12),
-92:Warp(6,11), -92:Warp(6,11),
-93:GetMaxInventory(2),
// Zandronum's // Zandronum's
-100:ResetMap(0), -100:ResetMap(0),

View file

@ -213,6 +213,7 @@ keywords
GetLineRowOffset = "int GetLineRowOffset(void)"; GetLineRowOffset = "int GetLineRowOffset(void)";
GetLineUDMFFixed = "fixed GetLineUDMFFixed(int lineid, str key)"; GetLineUDMFFixed = "fixed GetLineUDMFFixed(int lineid, str key)";
GetLineUDMFInt = "int GetLineUDMFInt(int lineid, str key)"; GetLineUDMFInt = "int GetLineUDMFInt(int lineid, str key)";
GetMaxInventory = "int GetMaxInventory(int tid, str inventory)";
GetPlayerInfo = "int GetPlayerInfo(int playernumber, int playerinfo)"; GetPlayerInfo = "int GetPlayerInfo(int playernumber, int playerinfo)";
GetPlayerInput = "int GetPlayerInput(int player, int input)"; GetPlayerInput = "int GetPlayerInput(int player, int input)";
GetPolyobjX = "fixed GetPolyobjX(int polyid)"; GetPolyobjX = "fixed GetPolyobjX(int polyid)";
@ -406,7 +407,7 @@ keywords
Spawn = "int Spawn(str classname, fixed x, fixed y, fixed z[, int tid[, int angle]])\nSpawns an actor at the given X, Y and Z coordinates.\nOptionally a TID and a byte angle can be specified."; Spawn = "int Spawn(str classname, fixed x, fixed y, fixed z[, int tid[, int angle]])\nSpawns an actor at the given X, Y and Z coordinates.\nOptionally a TID and a byte angle can be specified.";
SpawnForced = "int SpawnForced(str classname, fixed x, fixed y, fixed z[, int tid[, int angle]])\nForces the actor to spawn, even in conditions where the spawning would normally fail.\nThe return value is the number of things spawned."; SpawnForced = "int SpawnForced(str classname, fixed x, fixed y, fixed z[, int tid[, int angle]])\nForces the actor to spawn, even in conditions where the spawning would normally fail.\nThe return value is the number of things spawned.";
SpawnDecal = "int SpawnDecal(int tid, str decalname, int flags[, fixed angle = 0.0[, fixed zoffset = 0.0[, fixed distance = 64.0]]])\nCreates a decal on a wall by tracing a line from the actor with the\nspecified tid until hitting said wall, on which the decal is then created.\nIf tid is 0, the tracing is done from the activator of the script.\ndecalname: The name of the decal to create, as defined in DECALDEF.\nflags: use SDF_ flags\nThe return value of the function is the number of decals spawned."; SpawnDecal = "int SpawnDecal(int tid, str decalname, int flags[, fixed angle = 0.0[, fixed zoffset = 0.0[, fixed distance = 64.0]]])\nCreates a decal on a wall by tracing a line from the actor with the\nspecified tid until hitting said wall, on which the decal is then created.\nIf tid is 0, the tracing is done from the activator of the script.\ndecalname: The name of the decal to create, as defined in DECALDEF.\nflags: use SDF_ flags\nThe return value of the function is the number of decals spawned.";
SpawnProjectile = "void SpawnProjectile(int tid, string type, int angle, int speed, int vspeed, int gravity, int newtid)"; SpawnProjectile = "void SpawnProjectile(int tid, str type, int angle, int speed, int vspeed, int gravity, int newtid)";
SpawnSpot = "int SpawnSpot(str classname, int spottid[, int tid[, int angle]])\nRequires a MapSpot at the location where you want the Actor to spawn.\nThe return value is the number of things spawned."; SpawnSpot = "int SpawnSpot(str classname, int spottid[, int tid[, int angle]])\nRequires a MapSpot at the location where you want the Actor to spawn.\nThe return value is the number of things spawned.";
SpawnSpotFacing = "int SpawnSpotFacing(str classname, int spottid[, int tid])\nRequires a MapSpot at the location where you want the Actor to spawn.\nThe thing will assume the angle of the mapspot it is spawned to.\nThe return value is the number of things spawned."; SpawnSpotFacing = "int SpawnSpotFacing(str classname, int spottid[, int tid])\nRequires a MapSpot at the location where you want the Actor to spawn.\nThe thing will assume the angle of the mapspot it is spawned to.\nThe return value is the number of things spawned.";
SpawnSpotFacingForced = "int SpawnSpotFacingForced(str classname, int spottid[, int tid])\nRequires a MapSpot at the location where you want the Actor to spawn.\nForces the actor to spawn, even in conditions where the spawning would normally fail.\nThe thing will assume the angle of the mapspot it is spawned to.\nThe return value is the number of things spawned."; SpawnSpotFacingForced = "int SpawnSpotFacingForced(str classname, int spottid[, int tid])\nRequires a MapSpot at the location where you want the Actor to spawn.\nForces the actor to spawn, even in conditions where the spawning would normally fail.\nThe thing will assume the angle of the mapspot it is spawned to.\nThe return value is the number of things spawned.";
@ -422,7 +423,7 @@ keywords
StopSound = "void StopSound(int tid, int channel)\nStops the sound currently playing on the specified channel for the actor with matching tid"; StopSound = "void StopSound(int tid, int channel)\nStops the sound currently playing on the specified channel for the actor with matching tid";
str = "str expression"; str = "str expression";
StrCmp = "int StrCmp(str string1, str string2[, int maxcomparenum])\nCompares the two strings passed in arguments string1 and string2 character by character.\nIf maxcomparenum is specified, it only compares up to maxcomparenum characters of each string."; StrCmp = "int StrCmp(str string1, str string2[, int maxcomparenum])\nCompares the two strings passed in arguments string1 and string2 character by character.\nIf maxcomparenum is specified, it only compares up to maxcomparenum characters of each string.";
StrCpy = "bool StrCpy(a:destination, string source[, int source_index])\nCopy a source string to a destination array as a series of characters.\nOptionally, the copy can start from a given index in the source string.\nReturns TRUE if the entire string (or substring) was successfully copied to the array;\nFALSE if the copy ran out of room or if a negative source_index was given."; StrCpy = "bool StrCpy(a:destination, str source[, int source_index])\nCopy a source string to a destination array as a series of characters.\nOptionally, the copy can start from a given index in the source string.\nReturns TRUE if the entire string (or substring) was successfully copied to the array;\nFALSE if the copy ran out of room or if a negative source_index was given.";
StrIcmp = "int StrCmp(str string1, str string2[, int maxcomparenum])\nStrIcmp is case-insensitive version of StrCmp"; StrIcmp = "int StrCmp(str string1, str string2[, int maxcomparenum])\nStrIcmp is case-insensitive version of StrCmp";
StrLeft = "str StrLeft(str string, int length)\nCreates a new string containing the length first characters of string.\nIf string does not exist, an empty string is returned.\nIf string is shorter than length characters, the entire string is returned."; StrLeft = "str StrLeft(str string, int length)\nCreates a new string containing the length first characters of string.\nIf string does not exist, an empty string is returned.\nIf string is shorter than length characters, the entire string is returned.";
StrLen = "int StrLen(str string)"; StrLen = "int StrLen(str string)";

View file

@ -32,11 +32,11 @@ namespace CodeImp.DoomBuilder.Config
#region ================== Variables #region ================== Variables
private string name; private readonly string name;
private string title; private readonly string title;
private CompilerInfo compiler; private readonly CompilerInfo compiler;
private string parameters; private readonly string parameters;
private bool specialoutputfile; private readonly bool specialoutputfile;
#endregion #endregion
@ -55,15 +55,13 @@ namespace CodeImp.DoomBuilder.Config
// Constructor // Constructor
public NodebuilderInfo(string filename, string name, Configuration cfg) public NodebuilderInfo(string filename, string name, Configuration cfg)
{ {
string compilername;
General.WriteLogLine("Registered nodebuilder configuration '" + name + "' from '" + filename + "'"); General.WriteLogLine("Registered nodebuilder configuration '" + name + "' from '" + filename + "'");
// Initialize // Initialize
this.name = name; this.name = name;
this.compiler = null; this.compiler = null;
this.title = cfg.ReadSetting("nodebuilders." + name + ".title", "<untitled configuration>"); this.title = cfg.ReadSetting("nodebuilders." + name + ".title", "<untitled configuration>");
compilername = cfg.ReadSetting("nodebuilders." + name + ".compiler", ""); string compilername = cfg.ReadSetting("nodebuilders." + name + ".compiler", "");
this.parameters = cfg.ReadSetting("nodebuilders." + name + ".parameters", ""); this.parameters = cfg.ReadSetting("nodebuilders." + name + ".parameters", "");
// Check for special output filename // Check for special output filename
@ -104,7 +102,7 @@ namespace CodeImp.DoomBuilder.Config
public int CompareTo(NodebuilderInfo other) public int CompareTo(NodebuilderInfo other)
{ {
// Compare // Compare
return name.CompareTo(other.name); return String.Compare(name, other.name, StringComparison.Ordinal);
} }
// String representation // String representation

View file

@ -327,6 +327,12 @@ namespace CodeImp.DoomBuilder.BuilderModes
SectorLevel l = lightlevels[i]; SectorLevel l = lightlevels[i];
SectorLevel pl = lightlevels[i + 1]; SectorLevel pl = lightlevels[i + 1];
// Glow levels should not affect light transfer
if(l.type == SectorLevelType.Glow) continue;
// Glow levels don't cast light
if(pl.type == SectorLevelType.Glow && lightlevels.Count > i + 2) pl = lightlevels[i + 2];
if(l.lighttype == LightLevelType.TYPE1) if(l.lighttype == LightLevelType.TYPE1)
{ {
stored = pl; stored = pl;