stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-01-18 22:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed leftovers of default string value implementation

Browse source
This commit is contained in:
ZZYZX 2018-02-04 02:50:38 +02:00
parent d8bee559dc
commit 089906bac0
5 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Source/Core/Config/ArgumentInfo.cs
View file

@ -104,13 +104,7 @@ namespace CodeImp.DoomBuilder.Config
this.type = cfg.ReadSetting(argspath + ".arg" + istr + ".type", 0);
this.str = cfg.ReadSetting(argspath + ".arg" + istr + ".str", false);
this.titlestr = cfg.ReadSetting(argspath + ".arg" + istr + ".titlestr", this.title);
string dv = cfg.ReadSetting(argspath + ".arg" + istr + ".default", string.Empty);
int dvi;
if (int.TryParse(dv, out dvi))
this.defaultvalue = dvi;
else if (this.str) this.defaultvalue = dv;
else this.defaultvalue = 0;
this.defaultvalue = cfg.ReadSetting(argspath + ".arg" + istr + ".default", 0);
//mxd. Get rendering hint settings
string renderstyle = cfg.ReadSetting(argspath + ".arg" + istr + ".renderstyle", string.Empty);

4
Source/Core/Config/ProgramConfiguration.cs
View file

@ -670,9 +670,7 @@ namespace CodeImp.DoomBuilder.Config
ThingTypeInfo tti = General.Map.Data.GetThingInfoEx(t.Type);
if(tti != null)
{
if (tti.Args[0].DefaultValue is string)
t.Fields["arg0str"] = new UniValue(UniversalType.String, (string)tti.Args[0].DefaultValue);
else t.Args[0] = (int)tti.Args[0].DefaultValue;
t.Args[0] = (int)tti.Args[0].DefaultValue;
t.Args[1] = (int)tti.Args[1].DefaultValue;
t.Args[2] = (int)tti.Args[2].DefaultValue;
t.Args[3] = (int)tti.Args[3].DefaultValue;

4
Source/Core/Properties/AssemblyInfo.cs
View file

@ -30,6 +30,6 @@ using CodeImp.DoomBuilder;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.3.0.2994")]
[assembly: AssemblyVersion("2.3.0.2995")]
[assembly: NeutralResourcesLanguageAttribute("en")]
[assembly: AssemblyHash("8375ece")]
[assembly: AssemblyHash("d8bee55")]

2
Source/Core/Resources/world3d.fx
View file

@ -56,8 +56,10 @@ float4 stencilColor;
//light
float4 lightPosAndRadius;
float3 lightOrientation; // this is a vector that points in light's direction
float4 lightColor; //also used as fog color
float ignoreNormals; // ignore normals in lighting equation. used for non-attenuated lights on models.
float spotLight; // use lightOrientation
//fog
const float4 campos; //w is set to fade factor (distance, at wich fog color completely overrides pixel color)

2
Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs
View file

@ -29,5 +29,5 @@ using System.Resources;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.3.0.2994")]
[assembly: AssemblyVersion("2.3.0.2995")]
[assembly: NeutralResourcesLanguageAttribute("en")]