fix map test settings interface (by Joseph Stalin)

diff --git a/src/editor/Editor.lpi b/src/editor/Editor.lpi
index 896b9b361f75091abb56686ec58c502c57ba84f3..f01210375595d4c169dffa7fc9368aeba44a7a00 100644 (file)
--- a/src/editor/Editor.lpi
+++ b/src/editor/Editor.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <General>
       <Flags>
         <MainUnitHasUsesSectionForAllUnits Value="False"/>
@@ -81,9 +81,10 @@
       <Version Value="2"/>
     </PublishOptions>
     <RunParams>
-      <local>
-        <FormatVersion Value="1"/>
-      </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default"/>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="2">
       <Item1>

diff --git a/src/editor/f_maptest.lfm b/src/editor/f_maptest.lfm
index c3cc7d1e31faa8451cff83781e3a21dd38d948ee..89503fb59ad2658b30e6ccb8076b58ecc4659c99 100644 (file)
--- a/src/editor/f_maptest.lfm
+++ b/src/editor/f_maptest.lfm
@@ -1,12 +1,12 @@
 object MapTestForm: TMapTestForm
   Left = 291
-  Height = 270
+  Height = 322
   Top = 194
   Width = 367
   BorderIcons = [biSystemMenu]
   BorderStyle = bsSingle
   Caption = 'Настройки теста в игре'
-  ClientHeight = 270
+  ClientHeight = 322
   ClientWidth = 367
   Color = clBtnFace
   Font.Color = clWindowText
@@ -15,11 +15,11 @@ object MapTestForm: TMapTestForm
   OnActivate = FormActivate
   OnCreate = FormCreate
   Position = poScreenCenter
-  LCLVersion = '1.6.4.0'
+  LCLVersion = '2.0.2.0'
   object bOK: TButton
     Left = 192
     Height = 25
-    Top = 240
+    Top = 280
     Width = 75
     Caption = 'OK'
     Default = True
@@ -29,7 +29,7 @@ object MapTestForm: TMapTestForm
   object bCancel: TButton
     Left = 286
     Height = 25
-    Top = 240
+    Top = 280
     Width = 75
     Cancel = True
     Caption = 'Отмена'
@@ -38,23 +38,23 @@ object MapTestForm: TMapTestForm
   end
   object GroupBox1: TGroupBox
     Left = 8
-    Height = 233
+    Height = 264
     Top = 0
     Width = 353
-    ClientHeight = 215
-    ClientWidth = 349
+    ClientHeight = 262
+    ClientWidth = 351
     TabOrder = 0
     object LabelTime: TLabel
       Left = 14
-      Height = 13
+      Height = 16
       Top = 98
-      Width = 83
+      Width = 80
       Caption = 'Лимит времени:'
       ParentColor = False
     end
     object LabelSecs: TLabel
       Left = 174
-      Height = 13
+      Height = 16
       Top = 98
       Width = 35
       Caption = 'секунд'
@@ -62,25 +62,25 @@ object MapTestForm: TMapTestForm
     end
     object LabelScore: TLabel
       Left = 14
-      Height = 13
+      Height = 16
       Top = 122
-      Width = 68
+      Width = 66
       Caption = 'Лимит очков:'
       ParentColor = False
     end
     object LabelPath: TLabel
       Left = 14
-      Height = 13
+      Height = 16
       Top = 170
-      Width = 107
+      Width = 103
       Caption = 'Путь к Doom2DF.exe:'
       ParentColor = False
     end
     object rbDM: TRadioButton
       Left = 14
-      Height = 17
+      Height = 21
       Top = 2
-      Width = 76
+      Width = 84
       Caption = 'Deathmatch'
       Checked = True
       TabOrder = 0
@@ -88,49 +88,49 @@ object MapTestForm: TMapTestForm
     end
     object rbTDM: TRadioButton
       Left = 14
-      Height = 17
+      Height = 21
       Top = 18
-      Width = 106
+      Width = 113
       Caption = 'Team Deathmatch'
       TabOrder = 1
     end
     object rbCTF: TRadioButton
       Left = 14
-      Height = 17
+      Height = 21
       Top = 34
-      Width = 96
+      Width = 106
       Caption = 'Capture the Flag'
       TabOrder = 2
     end
     object rbCOOP: TRadioButton
       Left = 14
-      Height = 17
+      Height = 21
       Top = 50
-      Width = 75
+      Width = 83
       Caption = 'Cooperative'
       TabOrder = 3
     end
     object cbTwoPlayers: TCheckBox
       Left = 174
-      Height = 17
+      Height = 21
       Top = 2
-      Width = 77
+      Width = 80
       Caption = 'Два игрока'
       TabOrder = 4
     end
     object cbTeamDamage: TCheckBox
       Left = 174
-      Height = 17
+      Height = 21
       Top = 18
-      Width = 124
+      Width = 126
       Caption = 'Урон своей команде'
       TabOrder = 5
     end
     object cbAllowExit: TCheckBox
       Left = 174
-      Height = 17
+      Height = 21
       Top = 34
-      Width = 103
+      Width = 109
       Caption = 'Выход из уровня'
       Checked = True
       State = cbChecked
@@ -138,23 +138,23 @@ object MapTestForm: TMapTestForm
     end
     object cbWeaponStay: TCheckBox
       Left = 174
-      Height = 17
+      Height = 21
       Top = 50
-      Width = 106
+      Width = 112
       Caption = 'Оружие остается'
       TabOrder = 7
     end
     object cbMonstersDM: TCheckBox
       Left = 174
-      Height = 17
+      Height = 21
       Top = 66
-      Width = 93
+      Width = 98
       Caption = 'Монстры в DM'
       TabOrder = 8
     end
     object edTime: TEdit
       Left = 102
-      Height = 21
+      Height = 28
       Top = 98
       Width = 49
       TabOrder = 9
@@ -162,7 +162,7 @@ object MapTestForm: TMapTestForm
     end
     object edScore: TEdit
       Left = 102
-      Height = 21
+      Height = 28
       Top = 122
       Width = 49
       TabOrder = 10
@@ -170,7 +170,7 @@ object MapTestForm: TMapTestForm
     end
     object UpDown2: TUpDown
       Left = 151
-      Height = 21
+      Height = 28
       Top = 122
       Width = 12
       Associate = edScore
@@ -178,11 +178,10 @@ object MapTestForm: TMapTestForm
       Min = 0
       Position = 0
       TabOrder = 12
-      Wrap = False
     end
     object UpDown1: TUpDown
       Left = 151
-      Height = 21
+      Height = 28
       Top = 98
       Width = 12
       Associate = edTime
@@ -190,11 +189,10 @@ object MapTestForm: TMapTestForm
       Min = 0
       Position = 0
       TabOrder = 11
-      Wrap = False
     end
     object edD2dexe: TEdit
       Left = 14
-      Height = 21
+      Height = 28
       Top = 186
       Width = 297
       TabOrder = 14
@@ -216,27 +214,34 @@ object MapTestForm: TMapTestForm
     end
     object edD2DArgs: TEdit
       Left = 14
-      Height = 21
-      Top = 200
+      Height = 28
+      Top = 232
       Width = 297
       TabOrder = 16
-      Text = ''
     end
     object cbMapOnce: TCheckBox
       Left = 14
-      Height = 17
+      Height = 21
       Top = 146
-      Width = 209
+      Width = 211
       Caption = 'Закрыть игру после выхода из карты'
       TabOrder = 13
     end
+    object LabelArgs: TLabel
+      Left = 14
+      Height = 16
+      Top = 216
+      Width = 103
+      Caption = 'Параметры запуска:'
+      ParentColor = False
+    end
   end
   object FindD2dDialog: TOpenDialog
     Title = 'Выберите файл игры Doom 2D: Forever'
     DefaultExt = '.exe'
     Filter = 'Doom2DF.exe|Doom2DF.exe;Doom2DF'
     Options = [ofHideReadOnly, ofNoChangeDir, ofEnableSizing]
-    left = 320
-    top = 144
+    left = 296
+    top = 128
   end
 end

diff --git a/src/editor/f_maptest.pas b/src/editor/f_maptest.pas
index b35dc4688d0d695c5d20f7696d5ab6a9c6ed274e..ed08dc7f3f514b9ef3a95baca2657e927f9a19ac 100644 (file)
--- a/src/editor/f_maptest.pas
+++ b/src/editor/f_maptest.pas
@@ -10,10 +10,14 @@ uses
   ComCtrls;
 
 type
+
+  { TMapTestForm }
+
   TMapTestForm = class (TForm)
     bOK: TButton;
     bCancel: TButton;
     GroupBox1: TGroupBox;
+    LabelArgs: TLabel;
   // Режим игры:
     rbDM: TRadioButton;
     rbTDM: TRadioButton;

diff --git a/src/editor/g_language.pas b/src/editor/g_language.pas
index 75d8787583f6dd9ae23e34dd4069d6bb3bf4dbf2..ea8c56292ad54cb666a9c6243520893fc95b95ec 100644 (file)
--- a/src/editor/g_language.pas
+++ b/src/editor/g_language.pas
@@ -534,6 +534,7 @@ Type
     I_LAB_LAUNCH_SECS,
     I_LAB_LAUNCH_SCORE,
     I_LAB_LAUNCH_PATH,
+    I_LAB_LAUNCH_ARGS,
 
     I_LAB_ES_GRID,
     I_LAB_ES_GRID_COLOR,
@@ -1663,6 +1664,8 @@ Const
                                        'Лимит очков:'),
     ('LAB LAUNCH PATH',                'Path to Doom2DF.exe:',
                                        'Путь к Doom2DF.exe:'),
+    ('LAB LAUNCH ARGS',                'Launch Arguments:',
+                                       'Параметры запуска:'),
 
     ('LAB ES GRID',                    'Grid Step:',
                                        'Шаг сетки:'),
@@ -2323,6 +2326,8 @@ begin
   // Путь:
     LabelPath.Caption := _lc[I_LAB_LAUNCH_PATH];
     FindD2dDialog.Title := _lc[I_CTRL_LAUNCH_OPEN];
+
+    LabelArgs.Caption := _lc[I_LAB_LAUNCH_ARGS];
   end;
 
 // Форма "Настройки редактора":