From 386b74d2ba0852d4672684bb63bdf1ee76a7369e Mon Sep 17 00:00:00 2001 From: MaxED Date: Tue, 24 Feb 2015 07:51:21 +0000 Subject: [PATCH] Fixed a couple of incorrect argument types in ZDoom_linedefs.cfg. Fixed apply/cancel buttons positions in Randomize Sectors/Things/Vertices windows. --- Build/Configurations/Includes/ZDoom_linedefs.cfg | 12 ++---------- Build/Configurations/Includes/ZDoom_misc.cfg | 1 + Build/Scripting/ZDoom_ACS.cfg | 2 +- .../Interface/JitterSectorsForm.Designer.cs | 2 +- .../Interface/JitterThingsForm.Designer.cs | 4 ++-- .../Interface/JitterVerticesForm.Designer.cs | 4 ++-- 6 files changed, 9 insertions(+), 16 deletions(-) diff --git a/Build/Configurations/Includes/ZDoom_linedefs.cfg b/Build/Configurations/Includes/ZDoom_linedefs.cfg index 65f71a50..a1aa6186 100644 --- a/Build/Configurations/Includes/ZDoom_linedefs.cfg +++ b/Build/Configurations/Includes/ZDoom_linedefs.cfg @@ -2879,28 +2879,24 @@ zdoom title = "Left Speed"; type = 11; enum = "scroll_speeds"; - default = 64; } arg2 { title = "Right Speed"; type = 11; enum = "scroll_speeds"; - default = 64; } arg3 { title = "Down Speed"; type = 11; enum = "scroll_speeds"; - default = 64; } arg4 { title = "Up Speed"; type = 11; enum = "scroll_speeds"; - default = 64; } } 222 @@ -2959,14 +2955,12 @@ zdoom title = "Horizontal Speed"; type = 11; enum = "scroll_speeds"; - default = 64; } arg4 { title = "Vertical Speed"; type = 11; enum = "scroll_speeds"; - default = 64; } } 224 @@ -2996,14 +2990,12 @@ zdoom title = "Horizontal Speed"; type = 11; enum = "scroll_speeds"; - default = 64; } arg4 { title = "Vertical Speed"; type = 11; enum = "scroll_speeds"; - default = 64; } } 225 @@ -3605,7 +3597,7 @@ zdoom arg2 { title = "Wind Angle"; - type = 8; + type = 22; } arg3 { @@ -3658,7 +3650,7 @@ zdoom arg2 { title = "Current Angle"; - type = 8; + type = 22; } arg3 { diff --git a/Build/Configurations/Includes/ZDoom_misc.cfg b/Build/Configurations/Includes/ZDoom_misc.cfg index 0b8708a6..d84ab9f2 100644 --- a/Build/Configurations/Includes/ZDoom_misc.cfg +++ b/Build/Configurations/Includes/ZDoom_misc.cfg @@ -660,6 +660,7 @@ enums scroll_speeds { + 0 = "0: Don't scroll"; 16 = "16: Very slow"; 32 = "32: Slow"; 64 = "64: Normal"; diff --git a/Build/Scripting/ZDoom_ACS.cfg b/Build/Scripting/ZDoom_ACS.cfg index b8ce34c5..4ea44a03 100644 --- a/Build/Scripting/ZDoom_ACS.cfg +++ b/Build/Scripting/ZDoom_ACS.cfg @@ -348,7 +348,7 @@ keywords Sector_SetGravity = "Sector_SetGravity(tag, ipart, fpart)"; Sector_SetLink = "Sector_SetLink(controltag, tag, surface, movetype)"; Sector_SetPlaneReflection = "Sector_SetPlaneReflection(tag, floor, ceiling)"; - Sector_SetRotation = "Sector_SetRotation(tag, floor-angle, ceiling-angle)"; + Sector_SetRotation = "Sector_SetRotation(tag, floorangle, ceilingangle)"; Sector_SetTranslucent = "Sector_SetTranslucent(tag, plane, amount, type)"; Sector_SetWind = "Sector_SetWind(tag, amount, angle, useline)"; SectorDamage = "void SectorDamage(int tag, int amount, str type, str protection_item, int flags)\nDoes the damage only when the function is called,\nand damages everything in the tagged sector.\nUses DAMAGE_ flags."; diff --git a/Source/Plugins/BuilderEffects/Interface/JitterSectorsForm.Designer.cs b/Source/Plugins/BuilderEffects/Interface/JitterSectorsForm.Designer.cs index 41fd2fa4..88117c95 100644 --- a/Source/Plugins/BuilderEffects/Interface/JitterSectorsForm.Designer.cs +++ b/Source/Plugins/BuilderEffects/Interface/JitterSectorsForm.Designer.cs @@ -64,7 +64,7 @@ // this.bCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.bCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.bCancel.Location = new System.Drawing.Point(276, 525); + this.bCancel.Location = new System.Drawing.Point(296, 525); this.bCancel.Name = "bCancel"; this.bCancel.Size = new System.Drawing.Size(75, 25); this.bCancel.TabIndex = 10; diff --git a/Source/Plugins/BuilderEffects/Interface/JitterThingsForm.Designer.cs b/Source/Plugins/BuilderEffects/Interface/JitterThingsForm.Designer.cs index fe2506f1..42eb9f48 100644 --- a/Source/Plugins/BuilderEffects/Interface/JitterThingsForm.Designer.cs +++ b/Source/Plugins/BuilderEffects/Interface/JitterThingsForm.Designer.cs @@ -72,9 +72,9 @@ // bApply // this.bApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.bApply.Location = new System.Drawing.Point(135, 399); + this.bApply.Location = new System.Drawing.Point(115, 399); this.bApply.Name = "bApply"; - this.bApply.Size = new System.Drawing.Size(75, 23); + this.bApply.Size = new System.Drawing.Size(95, 23); this.bApply.TabIndex = 0; this.bApply.Text = "Apply"; this.bApply.UseVisualStyleBackColor = true; diff --git a/Source/Plugins/BuilderEffects/Interface/JitterVerticesForm.Designer.cs b/Source/Plugins/BuilderEffects/Interface/JitterVerticesForm.Designer.cs index cece3daa..eb5a9cd2 100644 --- a/Source/Plugins/BuilderEffects/Interface/JitterVerticesForm.Designer.cs +++ b/Source/Plugins/BuilderEffects/Interface/JitterVerticesForm.Designer.cs @@ -46,9 +46,9 @@ // bApply // this.bApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.bApply.Location = new System.Drawing.Point(141, 45); + this.bApply.Location = new System.Drawing.Point(121, 45); this.bApply.Name = "bApply"; - this.bApply.Size = new System.Drawing.Size(75, 23); + this.bApply.Size = new System.Drawing.Size(95, 23); this.bApply.TabIndex = 6; this.bApply.Text = "Apply"; this.bApply.UseVisualStyleBackColor = true;