fixed a bug for metamod's plugins.ini

simplified the install method page a bit

installer/installer/UnitInstall.pas

@@ -512,17 +512,17 @@ begin
     if OS = osWindows then begin
       eStr.Add('win32   addons\amxmodx\dlls\amxmodx_mm.dll');
       eStr.Add('; Enable this instead for binary logging');
-      eStr.Add('; win32   addons\amxmodx\dlls\amxmodx_mm_bl.dll');
+      eStr.Add('; win32   addons\amxmodx\dlls\amxmodx_bl_mm.dll');
     end
     else if OS = osLinux32 then begin
       eStr.Add('linux   addons/amxmodx/dlls/amxmodx_mm_i386.so');
       eStr.Add('; Enable this instead for binary logging');
-      eStr.Add('; linux   addons\amxmodx\dlls\amxmodx_mm_bli386.so');
+      eStr.Add('; linux   addons/amxmodx/dlls/amxmodx_bl_mm_i386.so');
     end
     else begin
       eStr.Add('linux   addons/amxmodx/dlls/amxmodx_mm_amd64.so');
       eStr.Add('; Enable this instead for binary logging');
-      eStr.Add('; linux   addons\amxmodx\dlls\amxmodx_mm_blamd46.so');
+      eStr.Add('; linux   addons/amxmodx/dlls/amxmodx_bl_mm_amd64.so');
     end;
     eStr.SaveToFile(ePath + 'addons\metamod\plugins.ini');
     eStr.Free;

installer/installer/UnitfrmMain.dfm

@@ -1,6 +1,6 @@
 object frmMain: TfrmMain
-  Left = 160
+  Left = 423
-  Top = 182
+  Top = 274
   BorderIcons = [biSystemMenu, biMinimize]
   BorderStyle = bsSingle
   Caption = 'AMX Mod X Installer'
@@ -57,7 +57,7 @@ object frmMain: TfrmMain
     Top = 0
     Width = 527
     Height = 314
-    ActivePage = jspWelcome
+    ActivePage = jspInstallMethod
     PropagateEnable = False
     Align = alClient
     OnChange = jplWizardChange
@@ -5762,10 +5762,10 @@ object frmMain: TfrmMain
       Height = 314
       object lblInstallMethod: TLabel
         Left = 124
-        Top = 124
+        Top = 104
-        Width = 144
+        Width = 223
         Height = 13
-        Caption = 'Please select a install method:'
+        Caption = 'Please select an install method for AMX Mod X:'
       end
       object pnlHeader2: TPanel
         Left = 0
@@ -5825,9 +5825,9 @@ object frmMain: TfrmMain
         object lblSubTitle2: TLabel
           Left = 22
           Top = 28
-          Width = 235
+          Width = 241
           Height = 13
-          Caption = 'Choose a install method for installing AMX Mod X.'
+          Caption = 'Choose an install method for installing AMX Mod X.'
         end
         object bvlSpacer2: TBevel
           Left = 0
@@ -5840,11 +5840,83 @@ object frmMain: TfrmMain
       end
       object pnlInstallMethod: TPanel
         Left = 122
-        Top = 142
+        Top = 120
         Width = 267
-        Height = 97
+        Height = 153
         BevelOuter = bvLowered
         TabOrder = 1
+        object Label1: TLabel
+          Left = 4
+          Top = 16
+          Width = 243
+          Height = 11
+          Caption = 'Use this if your server has been installed on your own PC:'
+          Font.Charset = DEFAULT_CHARSET
+          Font.Color = clWindowText
+          Font.Height = -9
+          Font.Name = 'Tahoma'
+          Font.Style = []
+          ParentFont = False
+        end
+        object Label2: TLabel
+          Left = 209
+          Top = 16
+          Width = 18
+          Height = 11
+          Caption = 'own'
+          Font.Charset = DEFAULT_CHARSET
+          Font.Color = clWindowText
+          Font.Height = -9
+          Font.Name = 'Tahoma'
+          Font.Style = [fsItalic]
+          ParentFont = False
+        end
+        object Label3: TLabel
+          Left = 4
+          Top = 100
+          Width = 91
+          Height = 13
+          Caption = 'Remote installation'
+          Font.Charset = DEFAULT_CHARSET
+          Font.Color = clWindowText
+          Font.Height = -11
+          Font.Name = 'Tahoma'
+          Font.Style = [fsUnderline]
+          ParentFont = False
+        end
+        object Label4: TLabel
+          Left = 4
+          Top = 2
+          Width = 78
+          Height = 13
+          Caption = 'Local installation'
+          Font.Charset = DEFAULT_CHARSET
+          Font.Color = clWindowText
+          Font.Height = -11
+          Font.Name = 'Tahoma'
+          Font.Style = [fsUnderline]
+          ParentFont = False
+        end
+        object Label5: TLabel
+          Left = 4
+          Top = 114
+          Width = 209
+          Height = 11
+          Caption = 'Use this if you (for example) rented a gameserver:'
+          Font.Charset = DEFAULT_CHARSET
+          Font.Color = clWindowText
+          Font.Height = -9
+          Font.Name = 'Tahoma'
+          Font.Style = []
+          ParentFont = False
+        end
+        object pnlLocal: TPanel
+          Left = 4
+          Top = 28
+          Width = 259
+          Height = 65
+          BevelOuter = bvLowered
+          TabOrder = 0
           object frbDedicatedServer: TFlatRadioButton
             Left = 4
             Top = 4
@@ -5854,38 +5926,52 @@ object frmMain: TfrmMain
             Checked = True
             TabOrder = 0
             TabStop = True
+            OnClick = frbLocalClick
           end
           object frbListenServer: TFlatRadioButton
             Left = 4
-          Top = 22
+            Top = 18
             Width = 115
             Height = 17
             Caption = 'Steam Listen Server'
             TabOrder = 1
-        end
+            OnClick = frbLocalClick
-        object frbSelectMod: TFlatRadioButton
-          Left = 4
-          Top = 58
-          Width = 117
-          Height = 17
-          Caption = 'Select mod directory'
-          TabOrder = 3
-        end
-        object frbFTP: TFlatRadioButton
-          Left = 4
-          Top = 76
-          Width = 35
-          Height = 17
-          Caption = 'FTP'
-          TabOrder = 4
           end
           object frbStandaloneServer: TFlatRadioButton
             Left = 4
-          Top = 40
+            Top = 32
             Width = 107
             Height = 17
             Caption = 'Standalone Server'
             TabOrder = 2
+            OnClick = frbLocalClick
+          end
+          object frbSelectMod: TFlatRadioButton
+            Left = 4
+            Top = 46
+            Width = 117
+            Height = 17
+            Caption = 'Select mod directory'
+            TabOrder = 3
+            OnClick = frbLocalClick
+          end
+        end
+        object pnlRemote: TPanel
+          Left = 4
+          Top = 126
+          Width = 259
+          Height = 23
+          BevelOuter = bvLowered
+          TabOrder = 1
+          object frbFTP: TFlatRadioButton
+            Left = 4
+            Top = 4
+            Width = 35
+            Height = 17
+            Caption = 'FTP'
+            TabOrder = 0
+            OnClick = frbFTPClick
+          end
         end
       end
     end

installer/installer/UnitfrmMain.pas

@@ -39,10 +39,6 @@ type
     lblSubTitle2: TLabel;
     lblInstallMethod: TLabel;
     pnlInstallMethod: TPanel;
-    frbDedicatedServer: TFlatRadioButton;
-    frbListenServer: TFlatRadioButton;
-    frbSelectMod: TFlatRadioButton;
-    frbFTP: TFlatRadioButton;
     cmdBack: TFlatButton;
     jspFTP: TJvStandardPage;
     pnlHeader3: TPanel;
@@ -99,10 +95,21 @@ type
     IdAntiFreeze: TIdAntiFreeze;
     lblStep4: TLabel;
     cboGameAddon: TFlatComboBox;
-    frbStandaloneServer: TFlatRadioButton;
     tmrSpeed: TTimer;
     IdLogFile: TIdLogFile;
     lblInfo4: TLabel;
+    Label1: TLabel;
+    Label2: TLabel;
+    Label3: TLabel;
+    Label4: TLabel;
+    pnlLocal: TPanel;
+    frbDedicatedServer: TFlatRadioButton;
+    frbListenServer: TFlatRadioButton;
+    frbStandaloneServer: TFlatRadioButton;
+    frbSelectMod: TFlatRadioButton;
+    Label5: TLabel;
+    pnlRemote: TPanel;
+    frbFTP: TFlatRadioButton;
     procedure jvwStepsCancelButtonClick(Sender: TObject);
     procedure cmdCancelClick(Sender: TObject);
     procedure cmdNextClick(Sender: TObject);
@@ -126,6 +133,8 @@ type
     procedure trvDirectoriesCollapsing(Sender: TObject; Node: TTreeNode;
       var AllowCollapse: Boolean);
     procedure jspFTPShow(Sender: TObject);
+    procedure frbFTPClick(Sender: TObject);
+    procedure frbLocalClick(Sender: TObject);
   private
     OldProgress: Integer;
     CurrProgress: Integer;
@@ -787,4 +796,17 @@ begin
   Cancel := False;
 end;
 
+procedure TfrmMain.frbFTPClick(Sender: TObject);
+begin
+  frbDedicatedServer.Checked := False;
+  frbListenServer.Checked := False;
+  frbStandaloneServer.Checked := False;
+  frbSelectMod.Checked := False;
+end;
+
+procedure TfrmMain.frbLocalClick(Sender: TObject);
+begin
+  frbFTP.Checked := False;
+end;
+
 end.