mirror of
https://git.do.srb2.org/STJr/UltimateZoneBuilder.git
synced 2025-01-18 14:31:50 +00:00
@ removed unneeded dxwebsetup from the setup installer (directx redist is already included in the slimdx package)
- Added options to move both floor and ceiling together when a sector height change action is used on walls.
This commit is contained in:
parent
e26591bd4a
commit
4976459396
6 changed files with 13 additions and 6 deletions
Binary file not shown.
|
@ -35,7 +35,6 @@ Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:Ad
|
|||
|
||||
[Files]
|
||||
Source: Setup\dotnetfx35setup.exe; DestDir: {tmp}; Flags: dontcopy
|
||||
Source: Setup\dxwebsetup.exe; DestDir: {tmp}; Flags: dontcopy
|
||||
Source: Setup\slimdx.msi; DestDir: {tmp}; Flags: dontcopy
|
||||
Source: Builder.exe; DestDir: {app}; Flags: ignoreversion
|
||||
Source: Builder.cfg; DestDir: {app}; Flags: ignoreversion
|
||||
|
@ -148,8 +147,6 @@ begin
|
|||
if(componentsinstalled = false) then
|
||||
begin
|
||||
page_setup_components.Show;
|
||||
ExtractTemporaryFile('dxwebsetup.exe');
|
||||
Exec(ExpandConstant('{tmp}\dxwebsetup.exe'), '/Q', '', SW_SHOW, ewWaitUntilTerminated, errorcode);
|
||||
ExtractTemporaryFile('slimdx.msi');
|
||||
ShellExec('open', 'msiexec', ExpandConstant('/passive /i "{tmp}\slimdx.msi"'), '', SW_SHOW, ewWaitUntilTerminated, errorcode);
|
||||
componentsinstalled := true;
|
||||
|
@ -246,5 +243,6 @@ end;
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -105,7 +105,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.heightbysidedef.Items.AddRange(new object[] {
|
||||
"Do nothing",
|
||||
"Change the ceiling height",
|
||||
"Change the floor height"});
|
||||
"Change the floor height",
|
||||
"Change both floor and ceiling height"});
|
||||
this.heightbysidedef.Location = new System.Drawing.Point(353, 16);
|
||||
this.heightbysidedef.Name = "heightbysidedef";
|
||||
this.heightbysidedef.Size = new System.Drawing.Size(199, 22);
|
||||
|
|
|
@ -58,7 +58,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
#region ================== Properties
|
||||
|
||||
new public BaseVisualSector Sector { get { return (BaseVisualSector)base.Sector; } }
|
||||
public bool Changed { get { return changed; } set { changed |= value; } }
|
||||
public bool Changed { get { return changed; } set { changed = value; } }
|
||||
|
||||
#endregion
|
||||
|
||||
|
|
|
@ -191,6 +191,14 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
if(!this.Sector.Floor.Changed)
|
||||
this.Sector.Floor.OnChangeTargetHeight(amount);
|
||||
break;
|
||||
|
||||
// Change both
|
||||
case 3:
|
||||
if(!this.Sector.Floor.Changed)
|
||||
this.Sector.Floor.OnChangeTargetHeight(amount);
|
||||
if(!this.Sector.Ceiling.Changed)
|
||||
this.Sector.Ceiling.OnChangeTargetHeight(amount);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -187,7 +187,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
bvs.Floor.Changed = false;
|
||||
bvs.Ceiling.Changed = false;
|
||||
}
|
||||
|
||||
|
||||
selectionchanged = false;
|
||||
|
||||
if(singleselection)
|
||||
|
|
Loading…
Reference in a new issue