diff --git a/src/editor/f_main.pas b/src/editor/f_main.pas
index d3193006eebd27184d3b0bc384de61a50d60962e..070939d11262449427ddd618720d851addd242b1 100644 (file)
--- a/src/editor/f_main.pas
+++ b/src/editor/f_main.pas
unit f_main;
unit f_main;
-{$MODE Delphi}
+{$INCLUDE ../shared/a_modes.inc}
interface
uses
interface
uses
- LCLIntf, LCLType, LMessages, SysUtils, Variants, Classes, Graphics,
- Controls, Forms, Dialogs, ImgList, StdCtrls, Buttons,
- ComCtrls, ValEdit, Types, ToolWin, Menus, ExtCtrls,
- CheckLst, Grids;
+ LCLIntf, LCLType, SysUtils, Variants, Classes, Graphics,
+ Controls, Forms, Dialogs, StdCtrls, Buttons,
+ ComCtrls, ValEdit, Types, Menus, ExtCtrls,
+ CheckLst, Grids, OpenGLContext, utils, UTF8Process;
type
type
+
+ { TMainForm }
+
TMainForm = class(TForm)
TMainForm = class(TForm)
+ lLoad: TLabel;
// Главное меню:
MainMenu: TMainMenu;
// "Файл":
// Главное меню:
MainMenu: TMainMenu;
// "Файл":
// Панель инструментов:
MainToolBar: TToolBar;
// Панель инструментов:
MainToolBar: TToolBar;
+ pbLoad: TProgressBar;
+ pLoadProgress: TPanel;
+ RenderPanel: TOpenGLControl;
tbNewMap: TToolButton;
tbOpenMap: TToolButton;
tbSaveMap: TToolButton;
tbNewMap: TToolButton;
tbOpenMap: TToolButton;
tbSaveMap: TToolButton;
// Панель карты:
PanelMap: TPanel;
// Панель карты:
PanelMap: TPanel;
- // Панель отображения карты:
- RenderPanel: TPanel;
- // Панель загрузки:
- pLoadProgress: TPanel;
- lLoad: TLabel;
- pbLoad: TProgressBar;
// Полосы прокрутки:
sbHorizontal: TScrollBar;
sbVertical: TScrollBar;
// Полосы прокрутки:
sbHorizontal: TScrollBar;
sbVertical: TScrollBar;
procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);
procedure FormCreate(Sender: TObject);
procedure FormDestroy(Sender: TObject);
procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);
procedure FormCreate(Sender: TObject);
procedure FormDestroy(Sender: TObject);
+ procedure FormDropFiles(Sender: TObject; const FileNames: array of String);
procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
procedure FormResize(Sender: TObject);
procedure lbTextureListClick(Sender: TObject);
procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
procedure FormResize(Sender: TObject);
procedure lbTextureListClick(Sender: TObject);
+ procedure lbTextureListDrawItem(Control: TWinControl; Index: Integer;
+ ARect: TRect; State: TOwnerDrawState);
procedure RenderPanelMouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
procedure RenderPanelMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer);
procedure RenderPanelMouseUp(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
procedure RenderPanelMouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
procedure RenderPanelMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer);
procedure RenderPanelMouseUp(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
+ procedure RenderPanelPaint(Sender: TObject);
procedure RenderPanelResize(Sender: TObject);
procedure RenderPanelResize(Sender: TObject);
+ procedure Splitter1Moved(Sender: TObject);
procedure vleObjectPropertyEditButtonClick(Sender: TObject);
procedure vleObjectPropertyEditButtonClick(Sender: TObject);
+ procedure vleObjectPropertyApply(Sender: TObject);
procedure vleObjectPropertyGetPickList(Sender: TObject; const KeyName: String; Values: TStrings);
procedure vleObjectPropertyKeyDown(Sender: TObject; var Key: Word;
Shift: TShiftState);
procedure vleObjectPropertyGetPickList(Sender: TObject; const KeyName: String; Values: TStrings);
procedure vleObjectPropertyKeyDown(Sender: TObject; var Key: Word;
Shift: TShiftState);
procedure OnIdle(Sender: TObject; var Done: Boolean);
public
procedure RefreshRecentMenu();
procedure OnIdle(Sender: TObject; var Done: Boolean);
public
procedure RefreshRecentMenu();
- { procedure lbTextureListDrawItem(Control: TWinControl; Index: Integer;
- Rect: TRect; State: TOwnerDrawState); }
+ procedure OpenMapFile(FileName: String);
end;
const
end;
const
DrawPanelSize: Boolean;
BackColor: TColor;
PreviewColor: TColor;
DrawPanelSize: Boolean;
BackColor: TColor;
PreviewColor: TColor;
+ UseCheckerboard: Boolean;
Scale: Byte;
RecentCount: Integer;
RecentFiles: TStringList;
Scale: Byte;
RecentCount: Integer;
RecentFiles: TStringList;
LayerEnabled: Array [LAYER_BACK..LAYER_TRIGGERS] of Boolean =
(True, True, True, True, True, True, True, True, True);
LayerEnabled: Array [LAYER_BACK..LAYER_TRIGGERS] of Boolean =
(True, True, True, True, True, True, True, True, True);
- PreviewMode: Boolean = False;
+ PreviewMode: Byte = 0;
gLanguage: String;
FormCaption: String;
gLanguage: String;
FormCaption: String;
implementation
uses
implementation
uses
- f_options, e_graphics, e_log, dglOpenGL, Math,
+ f_options, e_graphics, e_log, GL, Math,
f_mapoptions, g_basic, f_about, f_mapoptimization,
f_mapcheck, f_addresource_texture, g_textures,
f_mapoptions, g_basic, f_about, f_mapoptimization,
f_mapcheck, f_addresource_texture, g_textures,
- f_activationtype, f_keys, MAPWRITER, MAPSTRUCT,
- MAPREADER, f_selectmap, f_savemap, WADEDITOR, MAPDEF,
+ f_activationtype, f_keys,
+ MAPREADER, f_selectmap, f_savemap, WADEDITOR, WADSTRUCT, MAPDEF,
g_map, f_saveminimap, f_addresource, CONFIG, f_packmap,
f_addresource_sound, f_maptest, f_choosetype,
g_map, f_saveminimap, f_addresource, CONFIG, f_packmap,
f_addresource_sound, f_maptest, f_choosetype,
- g_language, f_selectlang, ClipBrd, Windows;
+ g_language, f_selectlang, ClipBrd;
const
UNDO_DELETE_PANEL = 1;
const
UNDO_DELETE_PANEL = 1;
TCopyRecArray = Array of TCopyRec;
var
TCopyRecArray = Array of TCopyRec;
var
- hDC: THandle;
- hRC: THandle;
gEditorFont: DWORD;
gEditorFont: DWORD;
+ gDataLoaded: Boolean = False;
ShowMap: Boolean = False;
DrawRect: PRect = nil;
SnapToGrid: Boolean = True;
ShowMap: Boolean = False;
DrawRect: PRect = nil;
SnapToGrid: Boolean = True;
MouseRDown: Boolean;
MouseLDownPos: Types.TPoint;
MouseRDownPos: Types.TPoint;
MouseRDown: Boolean;
MouseLDownPos: Types.TPoint;
MouseRDownPos: Types.TPoint;
+ WASDOffset: TPoint;
SelectFlag: Byte = SELECTFLAG_NONE;
MouseAction: Byte = MOUSEACTION_NONE;
SelectFlag: Byte = SELECTFLAG_NONE;
MouseAction: Byte = MOUSEACTION_NONE;
case TriggerType of
TRIGGER_EXIT:
begin
case TriggerType of
TRIGGER_EXIT:
begin
- with ItemProps[InsertRow(_lc[I_PROP_TR_NEXT_MAP], Data.MapName, True)] do
+ str := win2utf(Data.MapName);
+ with ItemProps[InsertRow(_lc[I_PROP_TR_NEXT_MAP], str, True)] do
begin
EditStyle := esEllipsis;
ReadOnly := True;
begin
EditStyle := esEllipsis;
ReadOnly := True;
TRIGGER_SOUND:
begin
TRIGGER_SOUND:
begin
- with ItemProps[InsertRow(_lc[I_PROP_TR_SOUND_NAME], Data.SoundName, True)] do
+ str := win2utf(Data.SoundName);
+ with ItemProps[InsertRow(_lc[I_PROP_TR_SOUND_NAME], str, True)] do
begin
EditStyle := esEllipsis;
ReadOnly := True;
begin
EditStyle := esEllipsis;
ReadOnly := True;
TRIGGER_MUSIC:
begin
TRIGGER_MUSIC:
begin
- with ItemProps[InsertRow(_lc[I_PROP_TR_MUSIC_NAME], Data.MusicName, True)] do
+ str := win2utf(Data.MusicName);
+ with ItemProps[InsertRow(_lc[I_PROP_TR_MUSIC_NAME], str, True)] do
begin
EditStyle := esEllipsis;
ReadOnly := True;
begin
EditStyle := esEllipsis;
ReadOnly := True;
EditStyle := esPickList;
ReadOnly := True;
end;
EditStyle := esPickList;
ReadOnly := True;
end;
- with ItemProps[InsertRow(_lc[I_PROP_TR_MESSAGE_TEXT], Data.MessageText, True)] do
+ str := win2utf(Data.MessageText);
+ with ItemProps[InsertRow(_lc[I_PROP_TR_MESSAGE_TEXT], str, True)] do
begin
EditStyle := esSimple;
MaxLength := 100;
begin
EditStyle := esSimple;
MaxLength := 100;
MaxLength := 3;
end;
MaxLength := 3;
end;
- with ItemProps[InsertRow(_lc[I_PROP_TR_SHOT_ALLMAP], BoolNames[Data.ShotAllMap], True)] do
+ case Data.ShotAim of
+ 1: str := _lc[I_PROP_TR_SHOT_AIM_1];
+ 2: str := _lc[I_PROP_TR_SHOT_AIM_2];
+ 3: str := _lc[I_PROP_TR_SHOT_AIM_3];
+ else str := _lc[I_PROP_TR_SHOT_AIM_0];
+ end;
+ with ItemProps[InsertRow(_lc[I_PROP_TR_SHOT_AIM], str, True)-1] do
begin
EditStyle := esPickList;
ReadOnly := True;
begin
EditStyle := esPickList;
ReadOnly := True;
begin
RemoveSelectFromObjects();
ClearMap();
begin
RemoveSelectFromObjects();
ClearMap();
+ LoadSky(gMapInfo.SkyName);
UndoBuffer := nil;
slInvalidTextures.Clear();
MapCheckForm.lbErrorList.Clear();
UndoBuffer := nil;
slInvalidTextures.Clear();
MapCheckForm.lbErrorList.Clear();
function AddTexture(aWAD, aSection, aTex: String; silent: Boolean): Boolean;
var
function AddTexture(aWAD, aSection, aTex: String; silent: Boolean): Boolean;
var
- a: Integer;
+ a, FrameLen: Integer;
ok: Boolean;
FileName: String;
ResourceName: String;
ok: Boolean;
FileName: String;
ResourceName: String;
Width, Height: Word;
fn: String;
begin
Width, Height: Word;
fn: String;
begin
+ Data := nil;
+ FrameLen := 0;
+ Width := 0;
+ Height := 0;
+
if aSection = '..' then
SectionName := ''
else
if aSection = '..' then
SectionName := ''
else
end
else
begin // Внешний WAD
end
else
begin // Внешний WAD
- FileName := EditorDir+'wads\'+aWAD;
+ FileName := EditorDir+'wads/'+aWAD;
ResourceName := aWAD+':'+SectionName+'\'+aTex;
end;
ResourceName := aWAD+':'+SectionName+'\'+aTex;
end;
if IsAnim(FullResourceName) then
begin // Аним. текстура
if IsAnim(FullResourceName) then
begin // Аним. текстура
- GetFrame(FullResourceName, Data, Width, Height);
+ GetFrame(FullResourceName, Data, FrameLen, Width, Height);
- if g_CreateTextureMemorySize(Data, ResourceName, 0, 0, Width, Height, 1) then
+ if g_CreateTextureMemorySize(Data, FrameLen, ResourceName, 0, 0, Width, Height, 1) then
a := MainForm.lbTextureList.Items.Add(ResourceName);
end
else // Обычная текстура
a := MainForm.lbTextureList.Items.Add(ResourceName);
end
else // Обычная текстура
MapName: String;
idx: Integer;
begin
MapName: String;
idx: Integer;
begin
+ SelectMapForm.Caption := _lc[I_CAP_OPEN];
SelectMapForm.GetMaps(FileName);
if (FileName = OpenedWAD) and
SelectMapForm.GetMaps(FileName);
if (FileName = OpenedWAD) and
var
n, pw: Integer;
s, fn: String;
var
n, pw: Integer;
s, fn: String;
+ b: Boolean;
begin
s := LowerCase((Sender as TMenuItem).Caption);
Delete(s, Pos('&', s), 1);
begin
s := LowerCase((Sender as TMenuItem).Caption);
Delete(s, Pos('&', s), 1);
s := RecentFiles[n];
pw := Pos('.wad:\', LowerCase(s));
s := RecentFiles[n];
pw := Pos('.wad:\', LowerCase(s));
+ b := False;
if pw > 0 then
begin // Map name included
fn := Copy(s, 1, pw + 3);
Delete(s, 1, pw + 5);
if (FileExists(fn)) then
if pw > 0 then
begin // Map name included
fn := Copy(s, 1, pw + 3);
Delete(s, 1, pw + 5);
if (FileExists(fn)) then
+ begin
OpenMap(fn, s);
OpenMap(fn, s);
+ b := True;
+ end;
end
else // Only wad name
if (FileExists(s)) then
end
else // Only wad name
if (FileExists(s)) then
+ begin
OpenMap(s, '');
OpenMap(s, '');
+ b := True;
+ end;
+
+ if (not b) and (MessageBox(0, PChar(_lc[I_MSG_DEL_RECENT_PROMT]),
+ PChar(_lc[I_MSG_DEL_RECENT]), MB_ICONQUESTION or MB_YESNO) = idYes) then
+ begin
+ RecentFiles.Delete(n);
+ RefreshRecentMenu();
+ end;
end;
procedure TMainForm.aEditorOptionsExecute(Sender: TObject);
end;
procedure TMainForm.aEditorOptionsExecute(Sender: TObject);
OptionsForm.ShowModal();
end;
OptionsForm.ShowModal();
end;
-procedure TMainForm.FormCreate(Sender: TObject);
+procedure LoadStdFont(cfgres, texture: string; var FontID: DWORD);
var
var
- PixelFormat: GLuint;
- pfd: TPIXELFORMATDESCRIPTOR;
+ cwdt, chgt: Byte;
+ spc: ShortInt;
+ ID: DWORD;
+ wad: TWADEditor_1;
+ cfgdata: Pointer;
+ cfglen: Integer;
config: TConfig;
config: TConfig;
- i: Integer;
- s: String;
begin
begin
- Randomize();
+ cfgdata := nil;
+ cfglen := 0;
+ ID := 0;
- EditorDir := ExtractFilePath(Application.ExeName);
+ wad := TWADEditor_1.Create;
+ if wad.ReadFile(EditorDir+'data/Game.wad') then
+ wad.GetResource('FONTS', cfgres, cfgdata, cfglen);
+ wad.Free();
- e_InitLog(EditorDir+'Editor.log', WM_NEWFILE);
+ if cfglen <> 0 then
+ begin
+ if not g_CreateTextureWAD('FONT_STD', EditorDir+'data/Game.wad:FONTS\'+texture) then
+ e_WriteLog('ERROR ERROR ERROR', MSG_WARNING);
- e_WriteLog('Init OpenGL', MSG_NOTIFY);
+ config := TConfig.CreateMem(cfgdata, cfglen);
+ cwdt := Min(Max(config.ReadInt('FontMap', 'CharWidth', 0), 0), 255);
+ chgt := Min(Max(config.ReadInt('FontMap', 'CharHeight', 0), 0), 255);
+ spc := Min(Max(config.ReadInt('FontMap', 'Kerning', 0), -128), 127);
- InitOpenGL();
- hDC := GetDC(RenderPanel.Handle);
+ if g_GetTexture('FONT_STD', ID) then
+ e_TextureFontBuild(ID, FontID, cwdt, chgt, spc-2);
- FillChar(pfd, SizeOf(pfd), 0);
- with pfd do
- begin
- nSize := SizeOf(pfd);
- nVersion := 1;
- dwFlags := PFD_DRAW_TO_WINDOW or PFD_SUPPORT_OPENGL or PFD_DOUBLEBUFFER;
- dwLayerMask := PFD_MAIN_PLANE;
- iPixelType := PFD_TYPE_RGBA;
- cColorBits := 24;
- cDepthBits := 32;
- iLayerType := PFD_MAIN_PLANE;
- end;
- PixelFormat := ChoosePixelFormat (hDC, @pfd);
- SetPixelFormat(hDC, PixelFormat, @pfd);
+ config.Free();
+ end
+ else
+ e_WriteLog('Could not load FONT_STD', MSG_WARNING);
- hRC := wglCreateContext(hDC);
- ActivateRenderingContext(hDC, hRC);
+ if cfglen <> 0 then FreeMem(cfgdata);
+end;
+
+procedure TMainForm.FormCreate(Sender: TObject);
+var
+ config: TConfig;
+ i: Integer;
+ s: String;
+begin
+ Randomize();
- e_InitGL(False);
+ EditorDir := ExtractFilePath(Application.ExeName);
- gEditorFont := e_SimpleFontCreate('Arial Cyr', 12, FW_BOLD, hDC);
+ e_InitLog(EditorDir+'Editor.log', WM_NEWFILE);
slInvalidTextures := TStringList.Create;
slInvalidTextures := TStringList.Create;
- e_WriteLog('Loading data', MSG_NOTIFY);
- LoadData();
-
ShowLayer(LAYER_BACK, True);
ShowLayer(LAYER_WALLS, True);
ShowLayer(LAYER_FOREGROUND, True);
ShowLayer(LAYER_BACK, True);
ShowLayer(LAYER_WALLS, True);
ShowLayer(LAYER_FOREGROUND, True);
OpenedMap := '';
OpenedWAD := '';
OpenedMap := '';
OpenedWAD := '';
- config := TConfig.CreateFile(EditorDir+'\Editor.cfg');
+ config := TConfig.CreateFile(EditorDir+'Editor.cfg');
+ if config.ReadInt('Editor', 'XPos', -1) = -1 then
+ Position := poDesktopCenter
+ else begin
+ Left := config.ReadInt('Editor', 'XPos', Left);
+ Top := config.ReadInt('Editor', 'YPos', Top);
+ Width := config.ReadInt('Editor', 'Width', Width);
+ Height := config.ReadInt('Editor', 'Height', Height);
+ end;
if config.ReadBool('Editor', 'Maximize', False) then
WindowState := wsMaximized;
ShowMap := config.ReadBool('Editor', 'Minimap', False);
if config.ReadBool('Editor', 'Maximize', False) then
WindowState := wsMaximized;
ShowMap := config.ReadBool('Editor', 'Minimap', False);
DrawPanelSize := config.ReadBool('Editor', 'DrawPanelSize', True);
BackColor := config.ReadInt('Editor', 'BackColor', $7F6040);
PreviewColor := config.ReadInt('Editor', 'PreviewColor', $00FF00);
DrawPanelSize := config.ReadBool('Editor', 'DrawPanelSize', True);
BackColor := config.ReadInt('Editor', 'BackColor', $7F6040);
PreviewColor := config.ReadInt('Editor', 'PreviewColor', $00FF00);
+ UseCheckerboard := config.ReadBool('Editor', 'UseCheckerboard', True);
gColorEdge := config.ReadInt('Editor', 'EdgeColor', COLOR_EDGE);
gAlphaEdge := config.ReadInt('Editor', 'EdgeAlpha', ALPHA_EDGE);
if gAlphaEdge = 255 then
gColorEdge := config.ReadInt('Editor', 'EdgeColor', COLOR_EDGE);
gAlphaEdge := config.ReadInt('Editor', 'EdgeAlpha', ALPHA_EDGE);
if gAlphaEdge = 255 then
Application.OnIdle := OnIdle;
end;
Application.OnIdle := OnIdle;
end;
+procedure PrintBlack(X, Y: Integer; Text: string; FontID: DWORD);
+begin
+ // NOTE: all the font printing routines assume CP1251
+ e_TextureFontPrintEx(X, Y, Text, FontID, 0, 0, 0, 1.0);
+end;
+
procedure TMainForm.Draw();
var
procedure TMainForm.Draw();
var
- ps: TPaintStruct;
x, y: Integer;
a, b: Integer;
x, y: Integer;
a, b: Integer;
- ID: DWORD;
+ ID, PID: DWORD;
Width, Height: Word;
Rect: TRectWH;
ObjCount: Word;
aX, aY, aX2, aY2, XX, ScaleSz: Integer;
begin
Width, Height: Word;
Rect: TRectWH;
ObjCount: Word;
aX, aY, aX2, aY2, XX, ScaleSz: Integer;
begin
- BeginPaint(Handle, ps);
+ ID := 0;
+ PID := 0;
+ Width := 0;
+ Height := 0;
+
e_BeginRender();
e_Clear(GL_COLOR_BUFFER_BIT,
e_BeginRender();
e_Clear(GL_COLOR_BUFFER_BIT,
end;
// Рисуем сетку:
end;
// Рисуем сетку:
- if DotEnable and (not PreviewMode) then
+ if DotEnable and (PreviewMode = 0) then
begin
if DotSize = 2 then
a := -1
begin
if DotSize = 2 then
a := -1
// Превью текстуры:
if (lbTextureList.ItemIndex <> -1) and (cbPreview.Checked) and
// Превью текстуры:
if (lbTextureList.ItemIndex <> -1) and (cbPreview.Checked) and
- (not IsSpecialTextureSel()) and (not PreviewMode) then
+ (not IsSpecialTextureSel()) and (PreviewMode = 0) then
begin
if not g_GetTexture(SelectedTexture(), ID) then
g_GetTexture('NOTEXTURE', ID);
g_GetTextureSizeByID(ID, Width, Height);
begin
if not g_GetTexture(SelectedTexture(), ID) then
g_GetTexture('NOTEXTURE', ID);
g_GetTextureSizeByID(ID, Width, Height);
- e_DrawFillQuad(RenderPanel.Width-Width-2, RenderPanel.Height-Height-2,
- RenderPanel.Width-1, RenderPanel.Height-1,
- GetRValue(PreviewColor), GetGValue(PreviewColor), GetBValue(PreviewColor), 0);
- e_Draw(ID, RenderPanel.Width-Width-1, RenderPanel.Height-Height-1, 0, True, False);
+ if UseCheckerboard then
+ begin
+ if g_GetTexture('PREVIEW', PID) then
+ e_DrawFill(PID, RenderPanel.Width-Width, RenderPanel.Height-Height, Width div 16 + 1, Height div 16 + 1, 0, True, False);
+ end else
+ e_DrawFillQuad(RenderPanel.Width-Width-2, RenderPanel.Height-Height-2,
+ RenderPanel.Width-1, RenderPanel.Height-1,
+ GetRValue(PreviewColor), GetGValue(PreviewColor), GetBValue(PreviewColor), 0);
+ e_Draw(ID, RenderPanel.Width-Width, RenderPanel.Height-Height, 0, True, False);
end;
// Подсказка при выборе точки Телепорта:
end;
// Подсказка при выборе точки Телепорта:
e_DrawFillQuad(MousePos.X, MousePos.Y, MousePos.X+180, MousePos.Y+18, 192, 192, 192, 127);
e_DrawQuad(MousePos.X, MousePos.Y, MousePos.X+180, MousePos.Y+18, 255, 255, 255);
e_DrawFillQuad(MousePos.X, MousePos.Y, MousePos.X+180, MousePos.Y+18, 192, 192, 192, 127);
e_DrawQuad(MousePos.X, MousePos.Y, MousePos.X+180, MousePos.Y+18, 255, 255, 255);
- e_SimpleFontPrint(MousePos.X+8, MousePos.Y+14, PChar(_lc[I_HINT_TELEPORT]), gEditorFont, 0, 0, 0);
+ PrintBlack(MousePos.X+2, MousePos.Y+2, _glc[I_HINT_TELEPORT], gEditorFont);
end;
// Подсказка при выборе точки появления:
end;
// Подсказка при выборе точки появления:
0, 0, 255);
e_DrawFillQuad(MousePos.X, MousePos.Y, MousePos.X+180, MousePos.Y+18, 192, 192, 192, 127);
e_DrawQuad(MousePos.X, MousePos.Y, MousePos.X+180, MousePos.Y+18, 255, 255, 255);
0, 0, 255);
e_DrawFillQuad(MousePos.X, MousePos.Y, MousePos.X+180, MousePos.Y+18, 192, 192, 192, 127);
e_DrawQuad(MousePos.X, MousePos.Y, MousePos.X+180, MousePos.Y+18, 255, 255, 255);
- e_SimpleFontPrint(MousePos.X+8, MousePos.Y+14, PChar(_lc[I_HINT_SPAWN]), gEditorFont, 0, 0, 0);
+ PrintBlack(MousePos.X+2, MousePos.Y+2, _glc[I_HINT_SPAWN], gEditorFont);
end;
// Подсказка при выборе панели двери:
end;
// Подсказка при выборе панели двери:
begin
e_DrawFillQuad(MousePos.X, MousePos.Y, MousePos.X+180, MousePos.Y+18, 192, 192, 192, 127);
e_DrawQuad(MousePos.X, MousePos.Y, MousePos.X+180, MousePos.Y+18, 255, 255, 255);
begin
e_DrawFillQuad(MousePos.X, MousePos.Y, MousePos.X+180, MousePos.Y+18, 192, 192, 192, 127);
e_DrawQuad(MousePos.X, MousePos.Y, MousePos.X+180, MousePos.Y+18, 255, 255, 255);
- e_SimpleFontPrint(MousePos.X+8, MousePos.Y+14, PChar(_lc[I_HINT_PANEL_DOOR]), gEditorFont, 0, 0, 0);
+ PrintBlack(MousePos.X+2, MousePos.Y+2, _glc[I_HINT_PANEL_DOOR], gEditorFont);
end;
// Подсказка при выборе панели с текстурой:
end;
// Подсказка при выборе панели с текстурой:
begin
e_DrawFillQuad(MousePos.X, MousePos.Y, MousePos.X+196, MousePos.Y+18, 192, 192, 192, 127);
e_DrawQuad(MousePos.X, MousePos.Y, MousePos.X+196, MousePos.Y+18, 255, 255, 255);
begin
e_DrawFillQuad(MousePos.X, MousePos.Y, MousePos.X+196, MousePos.Y+18, 192, 192, 192, 127);
e_DrawQuad(MousePos.X, MousePos.Y, MousePos.X+196, MousePos.Y+18, 255, 255, 255);
- e_SimpleFontPrint(MousePos.X+8, MousePos.Y+14, PChar(_lc[I_HINT_PANEL_TEXTURE]), gEditorFont, 0, 0, 0);
+ PrintBlack(MousePos.X+2, MousePos.Y+2, _glc[I_HINT_PANEL_TEXTURE], gEditorFont);
end;
// Подсказка при выборе панели индикации выстрела:
end;
// Подсказка при выборе панели индикации выстрела:
begin
e_DrawFillQuad(MousePos.X, MousePos.Y, MousePos.X+316, MousePos.Y+18, 192, 192, 192, 127);
e_DrawQuad(MousePos.X, MousePos.Y, MousePos.X+316, MousePos.Y+18, 255, 255, 255);
begin
e_DrawFillQuad(MousePos.X, MousePos.Y, MousePos.X+316, MousePos.Y+18, 192, 192, 192, 127);
e_DrawQuad(MousePos.X, MousePos.Y, MousePos.X+316, MousePos.Y+18, 255, 255, 255);
- e_SimpleFontPrint(MousePos.X+8, MousePos.Y+14, PChar(_lc[I_HINT_PANEL_SHOT]), gEditorFont, 0, 0, 0);
+ PrintBlack(MousePos.X+2, MousePos.Y+2, _glc[I_HINT_PANEL_SHOT], gEditorFont);
end;
// Подсказка при выборе панели лифта:
end;
// Подсказка при выборе панели лифта:
begin
e_DrawFillQuad(MousePos.X, MousePos.Y, MousePos.X+180, MousePos.Y+18, 192, 192, 192, 127);
e_DrawQuad(MousePos.X, MousePos.Y, MousePos.X+180, MousePos.Y+18, 255, 255, 255);
begin
e_DrawFillQuad(MousePos.X, MousePos.Y, MousePos.X+180, MousePos.Y+18, 192, 192, 192, 127);
e_DrawQuad(MousePos.X, MousePos.Y, MousePos.X+180, MousePos.Y+18, 255, 255, 255);
- e_SimpleFontPrint(MousePos.X+8, MousePos.Y+14, PChar(_lc[I_HINT_PANEL_LIFT]), gEditorFont, 0, 0, 0);
+ PrintBlack(MousePos.X+2, MousePos.Y+2, _glc[I_HINT_PANEL_LIFT], gEditorFont);
end;
// Подсказка при выборе монстра:
end;
// Подсказка при выборе монстра:
begin
e_DrawFillQuad(MousePos.X, MousePos.Y, MousePos.X+120, MousePos.Y+18, 192, 192, 192, 127);
e_DrawQuad(MousePos.X, MousePos.Y, MousePos.X+120, MousePos.Y+18, 255, 255, 255);
begin
e_DrawFillQuad(MousePos.X, MousePos.Y, MousePos.X+120, MousePos.Y+18, 192, 192, 192, 127);
e_DrawQuad(MousePos.X, MousePos.Y, MousePos.X+120, MousePos.Y+18, 255, 255, 255);
- e_SimpleFontPrint(MousePos.X+8, MousePos.Y+14, PChar(_lc[I_HINT_MONSTER]), gEditorFont, 0, 0, 0);
+ PrintBlack(MousePos.X+2, MousePos.Y+2, _glc[I_HINT_MONSTER], gEditorFont);
end;
// Подсказка при выборе области воздействия:
end;
// Подсказка при выборе области воздействия:
begin
e_DrawFillQuad(MousePos.X, MousePos.Y, MousePos.X+204, MousePos.Y+18, 192, 192, 192, 127);
e_DrawQuad(MousePos.X, MousePos.Y, MousePos.X+204, MousePos.Y+18, 255, 255, 255);
begin
e_DrawFillQuad(MousePos.X, MousePos.Y, MousePos.X+204, MousePos.Y+18, 192, 192, 192, 127);
e_DrawQuad(MousePos.X, MousePos.Y, MousePos.X+204, MousePos.Y+18, 255, 255, 255);
- e_SimpleFontPrint(MousePos.X+8, MousePos.Y+14, PChar(_lc[I_HINT_EXT_AREA]), gEditorFont, 0, 0, 0);
+ PrintBlack(MousePos.X+2, MousePos.Y+2, _glc[I_HINT_EXT_AREA], gEditorFont);
end;
// Рисуем текстуры, если чертим панель:
end;
// Рисуем текстуры, если чертим панель:
if MouseAction in [MOUSEACTION_DRAWPANEL, MOUSEACTION_DRAWTRIGGER] then
begin // Чертим новый
if MouseAction in [MOUSEACTION_DRAWPANEL, MOUSEACTION_DRAWTRIGGER] then
begin // Чертим новый
- e_SimpleFontPrint(MousePos.X+8, MousePos.Y+14, PChar(Format(_lc[I_HINT_WIDTH],
- [Abs(MousePos.X-MouseLDownPos.X)])), gEditorFont, 0, 0, 0);
- e_SimpleFontPrint(MousePos.X+8, MousePos.Y+28, PChar(Format(_lc[I_HINT_HEIGHT],
- [Abs(MousePos.Y-MouseLDownPos.Y)])), gEditorFont, 0, 0, 0);
+ PrintBlack(MousePos.X+2, MousePos.Y+2, Format(_glc[I_HINT_WIDTH],
+ [Abs(MousePos.X-MouseLDownPos.X)]), gEditorFont);
+ PrintBlack(MousePos.X+2, MousePos.Y+14, Format(_glc[I_HINT_HEIGHT],
+ [Abs(MousePos.Y-MouseLDownPos.Y)]), gEditorFont);
end
else // Растягиваем существующий
if SelectedObjects[GetFirstSelected].ObjectType in [OBJECT_PANEL, OBJECT_TRIGGER] then
end
else // Растягиваем существующий
if SelectedObjects[GetFirstSelected].ObjectType in [OBJECT_PANEL, OBJECT_TRIGGER] then
Height := gTriggers[SelectedObjects[GetFirstSelected].ID].Height;
end;
Height := gTriggers[SelectedObjects[GetFirstSelected].ID].Height;
end;
- e_SimpleFontPrint(MousePos.X+8, MousePos.Y+14, PChar(Format(_lc[I_HINT_WIDTH], [Width])),
- gEditorFont, 0, 0, 0);
- e_SimpleFontPrint(MousePos.X+8, MousePos.Y+28, PChar(Format(_lc[I_HINT_HEIGHT], [Height])),
- gEditorFont, 0, 0, 0);
+ PrintBlack(MousePos.X+2, MousePos.Y+2, Format(_glc[I_HINT_WIDTH], [Width]),
+ gEditorFont);
+ PrintBlack(MousePos.X+2, MousePos.Y+14, Format(_glc[I_HINT_HEIGHT], [Height]),
+ gEditorFont);
end;
end;
end;
end;
end; // Мини-карта
e_EndRender();
end; // Мини-карта
e_EndRender();
- SwapBuffers(hDC);
- EndPaint(Handle, ps);
+ RenderPanel.SwapBuffers();
end;
procedure TMainForm.FormResize(Sender: TObject);
end;
procedure TMainForm.FormResize(Sender: TObject);
trigger.Key := Trigger.Key or KEY_BLUETEAM;
// Параметры триггера:
trigger.Key := Trigger.Key or KEY_BLUETEAM;
// Параметры триггера:
- ZeroMemory(@trigger.Data.Default[0], 128);
+ FillByte(trigger.Data.Default[0], 128, 0);
case trigger.TriggerType of
// Переключаемая панель:
case trigger.TriggerType of
// Переключаемая панель:
trigger.Data.ShotPanelID := -1;
trigger.Data.ShotTarget := 0;
trigger.Data.ShotIntSight := 0;
trigger.Data.ShotPanelID := -1;
trigger.Data.ShotTarget := 0;
trigger.Data.ShotIntSight := 0;
- trigger.Data.ShotAllMap := False;
+ trigger.Data.ShotAim := TRIGGER_SHOT_AIM_DEFAULT;
trigger.Data.ShotPos.X := trigger.X-64;
trigger.Data.ShotPos.Y := trigger.Y-64;
trigger.Data.ShotAngle := 0;
trigger.Data.ShotPos.X := trigger.X-64;
trigger.Data.ShotPos.Y := trigger.Y-64;
trigger.Data.ShotAngle := 0;
end;
end;
end;
end;
+procedure TMainForm.RenderPanelPaint(Sender: TObject);
+begin
+ Draw();
+end;
+
procedure TMainForm.RenderPanelMouseMove(Sender: TObject;
Shift: TShiftState; X, Y: Integer);
var
procedure TMainForm.RenderPanelMouseMove(Sender: TObject;
Shift: TShiftState; X, Y: Integer);
var
begin
if DrawRect = nil then
New(DrawRect);
begin
if DrawRect = nil then
New(DrawRect);
- DrawRect.TopLeft := MouseRDownPos;
- DrawRect.BottomRight := MousePos;
+ DrawRect.Top := MouseRDownPos.y;
+ DrawRect.Left := MouseRDownPos.x;
+ DrawRect.Bottom := MousePos.y;
+ DrawRect.Right := MousePos.x;
end
else
// Двигаем выделенные объекты:
if MouseAction = MOUSEACTION_MOVEOBJ then
begin
MoveSelectedObjects(ssShift in Shift, ssCtrl in Shift,
end
else
// Двигаем выделенные объекты:
if MouseAction = MOUSEACTION_MOVEOBJ then
begin
MoveSelectedObjects(ssShift in Shift, ssCtrl in Shift,
- MousePos.X-LastMovePoint.X,
- MousePos.Y-LastMovePoint.Y);
+ MousePos.X-LastMovePoint.X+WASDOffset.X,
+ MousePos.Y-LastMovePoint.Y+WASDOffset.Y);
+ WASDOffset.X := 0;
+ WASDOffset.Y := 0;
end
else
// Меняем размер выделенного объекта:
end
else
// Меняем размер выделенного объекта:
if (SelectedObjectCount = 1) and
(SelectedObjects[GetFirstSelected].Live) then
begin
if (SelectedObjectCount = 1) and
(SelectedObjects[GetFirstSelected].Live) then
begin
- dWidth := MousePos.X-LastMovePoint.X;
- dHeight := MousePos.Y-LastMovePoint.Y;
+ dWidth := MousePos.X-LastMovePoint.X+WASDOffset.X;
+ dHeight := MousePos.Y-LastMovePoint.Y+WASDOffset.Y;
+ WASDOffset.X := 0;
+ WASDOffset.Y := 0;
case ResizeType of
RESIZETYPE_VERTICAL: dWidth := 0;
case ResizeType of
RESIZETYPE_VERTICAL: dWidth := 0;
begin
if DrawRect = nil then
New(DrawRect);
begin
if DrawRect = nil then
New(DrawRect);
- DrawRect.TopLeft := MouseLDownPos;
- DrawRect.BottomRight := MousePos;
+ DrawRect.Top := MouseLDownPos.y;
+ DrawRect.Left := MouseLDownPos.x;
+ DrawRect.Bottom := MousePos.y;
+ DrawRect.Right := MousePos.x;
end
else // Двигаем карту:
if MouseAction = MOUSEACTION_MOVEMAP then
end
else // Двигаем карту:
if MouseAction = MOUSEACTION_MOVEMAP then
CanClose := MessageBox(0, PChar(_lc[I_MSG_EXIT_PROMT]),
PChar(_lc[I_MSG_EXIT]),
MB_ICONQUESTION or MB_YESNO or
CanClose := MessageBox(0, PChar(_lc[I_MSG_EXIT_PROMT]),
PChar(_lc[I_MSG_EXIT]),
MB_ICONQUESTION or MB_YESNO or
- MB_TASKMODAL or MB_DEFBUTTON1) = idYes;
+ MB_DEFBUTTON1) = idYes;
end;
procedure TMainForm.aExitExecute(Sender: TObject);
end;
procedure TMainForm.aExitExecute(Sender: TObject);
config: TConfig;
i: Integer;
begin
config: TConfig;
i: Integer;
begin
- config := TConfig.CreateFile(EditorDir+'\Editor.cfg');
+ config := TConfig.CreateFile(EditorDir+'Editor.cfg');
+ if WindowState <> wsMaximized then
+ begin
+ config.WriteInt('Editor', 'XPos', Left);
+ config.WriteInt('Editor', 'YPos', Top);
+ config.WriteInt('Editor', 'Width', Width);
+ config.WriteInt('Editor', 'Height', Height);
+ end
+ else
+ begin
+ config.WriteInt('Editor', 'XPos', RestoredLeft);
+ config.WriteInt('Editor', 'YPos', RestoredTop);
+ config.WriteInt('Editor', 'Width', RestoredWidth);
+ config.WriteInt('Editor', 'Height', RestoredHeight);
+ end;
config.WriteBool('Editor', 'Maximize', WindowState = wsMaximized);
config.WriteBool('Editor', 'Minimap', ShowMap);
config.WriteInt('Editor', 'PanelProps', PanelProps.ClientWidth);
config.WriteBool('Editor', 'Maximize', WindowState = wsMaximized);
config.WriteBool('Editor', 'Minimap', ShowMap);
config.WriteInt('Editor', 'PanelProps', PanelProps.ClientWidth);
config.WriteStr('RecentFiles', IntToStr(i+1), '');
RecentFiles.Free();
config.WriteStr('RecentFiles', IntToStr(i+1), '');
RecentFiles.Free();
- config.SaveFile(EditorDir+'\Editor.cfg');
+ config.SaveFile(EditorDir+'Editor.cfg');
config.Free();
slInvalidTextures.Free;
config.Free();
slInvalidTextures.Free;
+end;
+
+procedure TMainForm.FormDropFiles(Sender: TObject;
+ const FileNames: array of String);
+begin
+ if Length(FileNames) <> 1 then
+ Exit;
- wglDeleteContext(hRC);
+ OpenMapFile(FileNames[0]);
end;
procedure TMainForm.RenderPanelResize(Sender: TObject);
end;
procedure TMainForm.RenderPanelResize(Sender: TObject);
MainForm.Resize();
end;
MainForm.Resize();
end;
+procedure TMainForm.Splitter1Moved(Sender: TObject);
+begin
+ FormResize(Sender);
+end;
+
procedure TMainForm.aMapOptionsExecute(Sender: TObject);
var
ResName: String;
procedure TMainForm.aMapOptionsExecute(Sender: TObject);
var
ResName: String;
if not (ssCtrl in Shift) then
begin
if not (ssCtrl in Shift) then
begin
+ // Быстрое превью карты:
+ if Key = Ord('E') then
+ begin
+ if PreviewMode = 0 then
+ PreviewMode := 2;
+ end;
+
// Вертикальный скролл карты:
with sbVertical do
begin
if Key = Ord('W') then
begin
// Вертикальный скролл карты:
with sbVertical do
begin
if Key = Ord('W') then
begin
+ if (MouseLDown or MouseRDown) and (Position >= DotStep) then
+ begin
+ Dec(WASDOffset.Y, DotStep);
+ RenderPanelMouseMove(Sender, Shift, LastMovePoint.X, LastMovePoint.Y);
+ end;
Position := IfThen(Position > DotStep, Position-DotStep, 0);
MapOffset.Y := -Round(Position/16) * 16;
end;
if Key = Ord('S') then
begin
Position := IfThen(Position > DotStep, Position-DotStep, 0);
MapOffset.Y := -Round(Position/16) * 16;
end;
if Key = Ord('S') then
begin
+ if (MouseLDown or MouseRDown) and (Position+DotStep <= Max) then
+ begin
+ Inc(WASDOffset.Y, DotStep);
+ RenderPanelMouseMove(Sender, Shift, LastMovePoint.X, LastMovePoint.Y);
+ end;
Position := IfThen(Position+DotStep < Max, Position+DotStep, Max);
MapOffset.Y := -Round(Position/16) * 16;
end;
Position := IfThen(Position+DotStep < Max, Position+DotStep, Max);
MapOffset.Y := -Round(Position/16) * 16;
end;
begin
if Key = Ord('A') then
begin
begin
if Key = Ord('A') then
begin
+ if (MouseLDown or MouseRDown) and (Position >= DotStep) then
+ begin
+ Dec(WASDOffset.X, DotStep);
+ RenderPanelMouseMove(Sender, Shift, LastMovePoint.X, LastMovePoint.Y);
+ end;
Position := IfThen(Position > DotStep, Position-DotStep, 0);
MapOffset.X := -Round(Position/16) * 16;
end;
if Key = Ord('D') then
begin
Position := IfThen(Position > DotStep, Position-DotStep, 0);
MapOffset.X := -Round(Position/16) * 16;
end;
if Key = Ord('D') then
begin
+ if (MouseLDown or MouseRDown) and (Position+DotStep <= Max) then
+ begin
+ Inc(WASDOffset.X, DotStep);
+ RenderPanelMouseMove(Sender, Shift, LastMovePoint.X, LastMovePoint.Y);
+ end;
Position := IfThen(Position+DotStep < Max, Position+DotStep, Max);
MapOffset.X := -Round(Position/16) * 16;
end;
Position := IfThen(Position+DotStep < Max, Position+DotStep, Max);
MapOffset.X := -Round(Position/16) * 16;
end;
DrawPressRect := False;
Exit;
end;
DrawPressRect := False;
Exit;
end;
+ i := -1;
// Выбор области воздействия, в зависимости от типа триггера
vleObjectProperty.FindRow(_lc[I_PROP_TR_EX_AREA], i);
// Выбор области воздействия, в зависимости от типа триггера
vleObjectProperty.FindRow(_lc[I_PROP_TR_EX_AREA], i);
if i > 0 then
begin
g_ProcessResourceStr(OpenedMap, @FileName, nil, nil);
if i > 0 then
begin
g_ProcessResourceStr(OpenedMap, @FileName, nil, nil);
+ SelectMapForm.Caption := _lc[I_CAP_SELECT];
SelectMapForm.GetMaps(FileName);
if SelectMapForm.ShowModal() = mrOK then
SelectMapForm.GetMaps(FileName);
if SelectMapForm.ShowModal() = mrOK then
TextureID: DWORD;
TextureWidth, TextureHeight: Word;
begin
TextureID: DWORD;
TextureWidth, TextureHeight: Word;
begin
+ TextureID := 0;
+ TextureWidth := 0;
+ TextureHeight := 0;
if (lbTextureList.ItemIndex <> -1) and
(not IsSpecialTextureSel()) then
begin
if (lbTextureList.ItemIndex <> -1) and
(not IsSpecialTextureSel()) then
begin
end;
end;
end;
end;
+procedure TMainForm.lbTextureListDrawItem(Control: TWinControl; Index: Integer;
+ ARect: TRect; State: TOwnerDrawState);
+begin
+ with Control as TListBox do
+ begin
+ if LCLType.odSelected in State then
+ begin
+ Canvas.Brush.Color := clHighlight;
+ Canvas.Font.Color := clHighlightText;
+ end else
+ if (Items <> nil) and (Index >= 0) then
+ if slInvalidTextures.IndexOf(Items[Index]) > -1 then
+ begin
+ Canvas.Brush.Color := clRed;
+ Canvas.Font.Color := clWhite;
+ end;
+ Canvas.FillRect(ARect);
+ Canvas.TextRect(ARect, ARect.Left, ARect.Top, Items[Index]);
+ end;
+end;
+
procedure TMainForm.vleObjectPropertyGetPickList(Sender: TObject;
const KeyName: String; Values: TStrings);
begin
procedure TMainForm.vleObjectPropertyGetPickList(Sender: TObject;
const KeyName: String; Values: TStrings);
begin
Values.Add(_lc[I_PROP_TR_SHOT_TO_5]);
Values.Add(_lc[I_PROP_TR_SHOT_TO_6]);
end
Values.Add(_lc[I_PROP_TR_SHOT_TO_5]);
Values.Add(_lc[I_PROP_TR_SHOT_TO_6]);
end
+ else if KeyName = _lc[I_PROP_TR_SHOT_AIM] then
+ begin
+ Values.Add(_lc[I_PROP_TR_SHOT_AIM_0]);
+ Values.Add(_lc[I_PROP_TR_SHOT_AIM_1]);
+ Values.Add(_lc[I_PROP_TR_SHOT_AIM_2]);
+ Values.Add(_lc[I_PROP_TR_SHOT_AIM_3]);
+ end
else if (KeyName = _lc[I_PROP_PANEL_BLEND]) or
(KeyName = _lc[I_PROP_DM_ONLY]) or
(KeyName = _lc[I_PROP_ITEM_FALLS]) or
else if (KeyName = _lc[I_PROP_PANEL_BLEND]) or
(KeyName = _lc[I_PROP_DM_ONLY]) or
(KeyName = _lc[I_PROP_ITEM_FALLS]) or
(KeyName = _lc[I_PROP_TR_SCORE_CON]) or
(KeyName = _lc[I_PROP_TR_SCORE_MSG]) or
(KeyName = _lc[I_PROP_TR_HEALTH_MAX]) or
(KeyName = _lc[I_PROP_TR_SCORE_CON]) or
(KeyName = _lc[I_PROP_TR_SCORE_MSG]) or
(KeyName = _lc[I_PROP_TR_HEALTH_MAX]) or
- (KeyName = _lc[I_PROP_TR_SHOT_ALLMAP]) or
(KeyName = _lc[I_PROP_TR_SHOT_SOUND]) or
(KeyName = _lc[I_PROP_TR_EFFECT_CENTER]) then
begin
(KeyName = _lc[I_PROP_TR_SHOT_SOUND]) or
(KeyName = _lc[I_PROP_TR_EFFECT_CENTER]) then
begin
NoTextureID: DWORD;
NW, NH: Word;
begin
NoTextureID: DWORD;
NW, NH: Word;
begin
+ NoTextureID := 0;
+ NW := 0;
+ NH := 0;
+
if SelectedObjectCount() <> 1 then
Exit;
if not SelectedObjects[GetFirstSelected()].Live then
if SelectedObjectCount() <> 1 then
Exit;
if not SelectedObjects[GetFirstSelected()].Live then
case TriggerType of
TRIGGER_EXIT:
begin
case TriggerType of
TRIGGER_EXIT:
begin
- s := vleObjectProperty.Values[_lc[I_PROP_TR_NEXT_MAP]];
- ZeroMemory(@Data.MapName[0], 16);
+ s := utf2win(vleObjectProperty.Values[_lc[I_PROP_TR_NEXT_MAP]]);
+ FillByte(Data.MapName[0], 16, 0);
if s <> '' then
if s <> '' then
- CopyMemory(@Data.MapName[0], @s[1], Min(Length(s), 16));
+ Move(s[1], Data.MapName[0], Min(Length(s), 16));
end;
TRIGGER_TEXTURE:
end;
TRIGGER_TEXTURE:
TRIGGER_SOUND:
begin
TRIGGER_SOUND:
begin
- s := vleObjectProperty.Values[_lc[I_PROP_TR_SOUND_NAME]];
- ZeroMemory(@Data.SoundName[0], 64);
+ s := utf2win(vleObjectProperty.Values[_lc[I_PROP_TR_SOUND_NAME]]);
+ FillByte(Data.SoundName[0], 64, 0);
if s <> '' then
if s <> '' then
- CopyMemory(@Data.SoundName[0], @s[1], Min(Length(s), 64));
+ Move(s[1], Data.SoundName[0], Min(Length(s), 64));
Data.Volume := Min(StrToIntDef(vleObjectProperty.Values[_lc[I_PROP_TR_SOUND_VOLUME]], 0), 255);
Data.Pan := Min(StrToIntDef(vleObjectProperty.Values[_lc[I_PROP_TR_SOUND_PAN]], 0), 255);
Data.Volume := Min(StrToIntDef(vleObjectProperty.Values[_lc[I_PROP_TR_SOUND_VOLUME]], 0), 255);
Data.Pan := Min(StrToIntDef(vleObjectProperty.Values[_lc[I_PROP_TR_SOUND_PAN]], 0), 255);
TRIGGER_MUSIC:
begin
TRIGGER_MUSIC:
begin
- s := vleObjectProperty.Values[_lc[I_PROP_TR_MUSIC_NAME]];
- ZeroMemory(@Data.MusicName[0], 64);
+ s := utf2win(vleObjectProperty.Values[_lc[I_PROP_TR_MUSIC_NAME]]);
+ FillByte(Data.MusicName[0], 64, 0);
if s <> '' then
if s <> '' then
- CopyMemory(@Data.MusicName[0], @s[1], Min(Length(s), 64));
+ Move(s[1], Data.MusicName[0], Min(Length(s), 64));
if vleObjectProperty.Values[_lc[I_PROP_TR_MUSIC_ACT]] = _lc[I_PROP_TR_MUSIC_ON] then
Data.MusicAction := 1
if vleObjectProperty.Values[_lc[I_PROP_TR_MUSIC_ACT]] = _lc[I_PROP_TR_MUSIC_ON] then
Data.MusicAction := 1
else if vleObjectProperty.Values[_lc[I_PROP_TR_MESSAGE_TO]] = _lc[I_PROP_TR_MESSAGE_TO_5] then
Data.MessageSendTo := 5;
else if vleObjectProperty.Values[_lc[I_PROP_TR_MESSAGE_TO]] = _lc[I_PROP_TR_MESSAGE_TO_5] then
Data.MessageSendTo := 5;
- s := vleObjectProperty.Values[_lc[I_PROP_TR_MESSAGE_TEXT]];
- ZeroMemory(@Data.MessageText[0], 100);
+ s := utf2win(vleObjectProperty.Values[_lc[I_PROP_TR_MESSAGE_TEXT]]);
+ FillByte(Data.MessageText[0], 100, 0);
if s <> '' then
if s <> '' then
- CopyMemory(@Data.MessageText[0], @s[1], Min(Length(s), 100));
+ Move(s[1], Data.MessageText[0], Min(Length(s), 100));
Data.MessageTime := Min(Max(
StrToIntDef(vleObjectProperty.Values[_lc[I_PROP_TR_MESSAGE_TIME]], 0), 0), 65535);
Data.MessageTime := Min(Max(
StrToIntDef(vleObjectProperty.Values[_lc[I_PROP_TR_MESSAGE_TIME]], 0), 0), 65535);
Data.ShotTarget := 6;
Data.ShotIntSight := Min(Max(
StrToIntDef(vleObjectProperty.Values[_lc[I_PROP_TR_SHOT_SIGHT]], 0), 0), 65535);
Data.ShotTarget := 6;
Data.ShotIntSight := Min(Max(
StrToIntDef(vleObjectProperty.Values[_lc[I_PROP_TR_SHOT_SIGHT]], 0), 0), 65535);
- Data.ShotAllMap := NameToBool(vleObjectProperty.Values[_lc[I_PROP_TR_SHOT_ALLMAP]]);
+ Data.ShotAim := 0;
+ if vleObjectProperty.Values[_lc[I_PROP_TR_SHOT_AIM]] = _lc[I_PROP_TR_SHOT_AIM_1] then
+ Data.ShotAim := 1
+ else if vleObjectProperty.Values[_lc[I_PROP_TR_SHOT_AIM]] = _lc[I_PROP_TR_SHOT_AIM_2] then
+ Data.ShotAim := 2
+ else if vleObjectProperty.Values[_lc[I_PROP_TR_SHOT_AIM]] = _lc[I_PROP_TR_SHOT_AIM_3] then
+ Data.ShotAim := 3;
Data.ShotAngle := Min(
StrToIntDef(vleObjectProperty.Values[_lc[I_PROP_TR_SHOT_ANGLE]], 0), 360);
Data.ShotWait := Min(Max(
Data.ShotAngle := Min(
StrToIntDef(vleObjectProperty.Values[_lc[I_PROP_TR_SHOT_ANGLE]], 0), 360);
Data.ShotWait := Min(Max(
[SelectedTexture()])),
PChar(_lc[I_MSG_DEL_TEXTURE]),
MB_ICONQUESTION or MB_YESNO or
[SelectedTexture()])),
PChar(_lc[I_MSG_DEL_TEXTURE]),
MB_ICONQUESTION or MB_YESNO or
- MB_TASKMODAL or MB_DEFBUTTON1) <> idYes then
+ MB_DEFBUTTON1) <> idYes then
Exit;
if gPanels <> nil then
Exit;
if gPanels <> nil then
if (MessageBox(0, PChar(_lc[I_MSG_CLEAR_MAP_PROMT]),
PChar(_lc[I_MSG_CLEAR_MAP]),
MB_ICONQUESTION or MB_YESNO or
if (MessageBox(0, PChar(_lc[I_MSG_CLEAR_MAP_PROMT]),
PChar(_lc[I_MSG_CLEAR_MAP]),
MB_ICONQUESTION or MB_YESNO or
- MB_TASKMODAL or MB_DEFBUTTON1) = mrYes) then
+ MB_DEFBUTTON1) = mrYes) then
FullClear();
end;
FullClear();
end;
begin
b := lbTypeSelect.ItemIndex;
Values[Key] := PANELNAMES[b];
begin
b := lbTypeSelect.ItemIndex;
Values[Key] := PANELNAMES[b];
- bApplyProperty.Click();
+ vleObjectPropertyApply(Sender);
end;
end
end
end;
end
end
else if Key = _lc[I_PROP_TR_NEXT_MAP] then
begin // Выбор следующей карты:
g_ProcessResourceStr(OpenedMap, @FileName, nil, nil);
else if Key = _lc[I_PROP_TR_NEXT_MAP] then
begin // Выбор следующей карты:
g_ProcessResourceStr(OpenedMap, @FileName, nil, nil);
+ SelectMapForm.Caption := _lc[I_CAP_SELECT];
SelectMapForm.GetMaps(FileName);
if SelectMapForm.ShowModal() = mrOK then
begin
vleObjectProperty.Values[Key] := SelectMapForm.lbMapList.Items[SelectMapForm.lbMapList.ItemIndex];
SelectMapForm.GetMaps(FileName);
if SelectMapForm.ShowModal() = mrOK then
begin
vleObjectProperty.Values[Key] := SelectMapForm.lbMapList.Items[SelectMapForm.lbMapList.ItemIndex];
- bApplyProperty.Click();
+ vleObjectPropertyApply(Sender);
end;
end
else if (Key = _lc[I_PROP_TR_SOUND_NAME]) or
end;
end
else if (Key = _lc[I_PROP_TR_SOUND_NAME]) or
if (AddSoundForm.ShowModal() = mrOk) then
begin
vleObjectProperty.Values[Key] := AddSoundForm.ResourceName;
if (AddSoundForm.ShowModal() = mrOk) then
begin
vleObjectProperty.Values[Key] := AddSoundForm.ResourceName;
- bApplyProperty.Click();
+ vleObjectPropertyApply(Sender);
end;
end
else if Key = _lc[I_PROP_TR_ACTIVATION] then
end;
end
else if Key = _lc[I_PROP_TR_ACTIVATION] then
b := b or ACTIVATE_NOMONSTER;
Values[Key] := ActivateToStr(b);
b := b or ACTIVATE_NOMONSTER;
Values[Key] := ActivateToStr(b);
- bApplyProperty.Click();
+ vleObjectPropertyApply(Sender);
end;
end
else if Key = _lc[I_PROP_TR_KEYS] then
end;
end
else if Key = _lc[I_PROP_TR_KEYS] then
b := b or KEY_BLUETEAM;
Values[Key] := KeyToStr(b);
b := b or KEY_BLUETEAM;
Values[Key] := KeyToStr(b);
- bApplyProperty.Click();
+ vleObjectPropertyApply(Sender);
end;
end
else if Key = _lc[I_PROP_TR_FX_TYPE] then
end;
end
else if Key = _lc[I_PROP_TR_FX_TYPE] then
begin
b := lbTypeSelect.ItemIndex;
Values[Key] := EffectToStr(b);
begin
b := lbTypeSelect.ItemIndex;
Values[Key] := EffectToStr(b);
- bApplyProperty.Click();
+ vleObjectPropertyApply(Sender);
end;
end
else if Key = _lc[I_PROP_TR_MONSTER_TYPE] then
end;
end
else if Key = _lc[I_PROP_TR_MONSTER_TYPE] then
begin
b := lbTypeSelect.ItemIndex + MONSTER_DEMON;
Values[Key] := MonsterToStr(b);
begin
b := lbTypeSelect.ItemIndex + MONSTER_DEMON;
Values[Key] := MonsterToStr(b);
- bApplyProperty.Click();
+ vleObjectPropertyApply(Sender);
end;
end
else if Key = _lc[I_PROP_TR_ITEM_TYPE] then
end;
end
else if Key = _lc[I_PROP_TR_ITEM_TYPE] then
lbTypeSelect.Items.Add(ItemToStr(ITEM_HELMET));
lbTypeSelect.Items.Add(ItemToStr(ITEM_JETPACK));
lbTypeSelect.Items.Add(ItemToStr(ITEM_INVIS));
lbTypeSelect.Items.Add(ItemToStr(ITEM_HELMET));
lbTypeSelect.Items.Add(ItemToStr(ITEM_JETPACK));
lbTypeSelect.Items.Add(ItemToStr(ITEM_INVIS));
+ lbTypeSelect.Items.Add(ItemToStr(ITEM_WEAPON_FLAMETHROWER));
+ lbTypeSelect.Items.Add(ItemToStr(ITEM_AMMO_FUELCAN));
b := StrToItem(Values[Key]);
if b >= ITEM_BOTTLE then
b := StrToItem(Values[Key]);
if b >= ITEM_BOTTLE then
if b >= ITEM_WEAPON_KASTET then
b := b + 2;
Values[Key] := ItemToStr(b);
if b >= ITEM_WEAPON_KASTET then
b := b + 2;
Values[Key] := ItemToStr(b);
- bApplyProperty.Click();
+ vleObjectPropertyApply(Sender);
end;
end
else if Key = _lc[I_PROP_TR_SHOT_TYPE] then
end;
end
else if Key = _lc[I_PROP_TR_SHOT_TYPE] then
begin
b := lbTypeSelect.ItemIndex;
Values[Key] := ShotToStr(b);
begin
b := lbTypeSelect.ItemIndex;
Values[Key] := ShotToStr(b);
- bApplyProperty.Click();
+ vleObjectPropertyApply(Sender);
end;
end
else if Key = _lc[I_PROP_TR_EFFECT_TYPE] then
end;
end
else if Key = _lc[I_PROP_TR_EFFECT_TYPE] then
Values[Key] := _lc[I_PROP_TR_EFFECT_PARTICLE]
else
Values[Key] := _lc[I_PROP_TR_EFFECT_ANIMATION];
Values[Key] := _lc[I_PROP_TR_EFFECT_PARTICLE]
else
Values[Key] := _lc[I_PROP_TR_EFFECT_ANIMATION];
- bApplyProperty.Click();
+ vleObjectPropertyApply(Sender);
end;
end
else if Key = _lc[I_PROP_TR_EFFECT_SUBTYPE] then
end;
end
else if Key = _lc[I_PROP_TR_EFFECT_SUBTYPE] then
Values[Key] := _lc[I_PROP_TR_EFFECT_BUBBLE];
end;
Values[Key] := _lc[I_PROP_TR_EFFECT_BUBBLE];
end;
- bApplyProperty.Click();
+ vleObjectPropertyApply(Sender);
end;
end
else if Key = _lc[I_PROP_TR_EFFECT_COLOR] then
end;
end
else if Key = _lc[I_PROP_TR_EFFECT_COLOR] then
if ColorDialog.Execute then
begin
Values[Key] := IntToStr(ColorDialog.Color);
if ColorDialog.Execute then
begin
Values[Key] := IntToStr(ColorDialog.Color);
- bApplyProperty.Click();
+ vleObjectPropertyApply(Sender);
end;
end
else if Key = _lc[I_PROP_PANEL_TEX] then
begin // Смена текстуры:
vleObjectProperty.Values[Key] := SelectedTexture();
end;
end
else if Key = _lc[I_PROP_PANEL_TEX] then
begin // Смена текстуры:
vleObjectProperty.Values[Key] := SelectedTexture();
- bApplyProperty.Click();
+ vleObjectPropertyApply(Sender);
end;
end;
end;
end;
+procedure TMainForm.vleObjectPropertyApply(Sender: TObject);
+begin
+ // hack to prevent empty ID in list
+ RenderPanel.SetFocus();
+ bApplyProperty.Click();
+ vleObjectProperty.SetFocus();
+end;
+
procedure TMainForm.aSaveMapExecute(Sender: TObject);
var
FileName, Section, Res: String;
procedure TMainForm.aSaveMapExecute(Sender: TObject);
var
FileName, Section, Res: String;
if OpenDialog.Execute() then
begin
if OpenDialog.Execute() then
begin
- if (Pos('.ini', LowerCase(ExtractFileName(OpenDialog.FileName))) > 0) then
- begin // INI карты:
- FullClear();
+ OpenMapFile(OpenDialog.FileName);
+ OpenDialog.InitialDir := ExtractFileDir(OpenDialog.FileName);
+ end;
+end;
- pLoadProgress.Left := (RenderPanel.Width div 2)-(pLoadProgress.Width div 2);
- pLoadProgress.Top := (RenderPanel.Height div 2)-(pLoadProgress.Height div 2);
- pLoadProgress.Show();
+procedure TMainForm.OpenMapFile(FileName: String);
+begin
+ if (Pos('.ini', LowerCase(ExtractFileName(FileName))) > 0) then
+ begin // INI карты:
+ FullClear();
- OpenedMap := '';
- OpenedWAD := '';
+ pLoadProgress.Left := (RenderPanel.Width div 2)-(pLoadProgress.Width div 2);
+ pLoadProgress.Top := (RenderPanel.Height div 2)-(pLoadProgress.Height div 2);
+ pLoadProgress.Show();
- LoadMapOld(OpenDialog.FileName);
+ OpenedMap := '';
+ OpenedWAD := '';
- MainForm.Caption := Format('%s - %s', [FormCaption, ExtractFileName(OpenDialog.FileName)]);
+ LoadMapOld(FileName);
- pLoadProgress.Hide();
- MainForm.FormResize(Self);
- end
- else // Карты из WAD:
- begin
- OpenMap(OpenDialog.FileName, '');
- end;
+ MainForm.Caption := Format('%s - %s', [FormCaption, ExtractFileName(FileName)]);
- OpenDialog.InitialDir := ExtractFileDir(OpenDialog.FileName);
- end;
+ pLoadProgress.Hide();
+ MainForm.FormResize(Self);
+ end
+ else // Карты из WAD:
+ begin
+ OpenMap(FileName, '');
+ end;
end;
procedure TMainForm.FormActivate(Sender: TObject);
end;
procedure TMainForm.FormActivate(Sender: TObject);
else gLanguage := LANGUAGE_RUSSIAN;
end;
else gLanguage := LANGUAGE_RUSSIAN;
end;
- config := TConfig.CreateFile(EditorDir+'\Editor.cfg');
+ config := TConfig.CreateFile(EditorDir+'Editor.cfg');
config.WriteStr('Editor', 'Language', gLanguage);
config.WriteStr('Editor', 'Language', gLanguage);
- config.SaveFile(EditorDir+'\Editor.cfg');
+ config.SaveFile(EditorDir+'Editor.cfg');
config.Free();
end;
config.Free();
end;
MapList := WAD.GetResourcesList('');
MapList := WAD.GetResourcesList('');
+ SelectMapForm.Caption := _lc[I_CAP_REMOVE];
SelectMapForm.lbMapList.Items.Clear();
if MapList <> nil then
for a := 0 to High(MapList) do
SelectMapForm.lbMapList.Items.Clear();
if MapList <> nil then
for a := 0 to High(MapList) do
- SelectMapForm.lbMapList.Items.Add(MapList[a]);
+ SelectMapForm.lbMapList.Items.Add(win2utf(MapList[a]));
if (SelectMapForm.ShowModal() = mrOK) then
begin
str := SelectMapForm.lbMapList.Items[SelectMapForm.lbMapList.ItemIndex];
MapName := '';
if (SelectMapForm.ShowModal() = mrOK) then
begin
str := SelectMapForm.lbMapList.Items[SelectMapForm.lbMapList.ItemIndex];
MapName := '';
- CopyMemory(@MapName[0], @str[1], Min(16, Length(str)));
+ Move(str[1], MapName[0], Min(16, Length(str)));
if MessageBox(0, PChar(Format(_lc[I_MSG_DELETE_MAP_PROMT],
[MapName, OpenDialog.FileName])),
PChar(_lc[I_MSG_DELETE_MAP]),
MB_ICONQUESTION or MB_YESNO or
if MessageBox(0, PChar(Format(_lc[I_MSG_DELETE_MAP_PROMT],
[MapName, OpenDialog.FileName])),
PChar(_lc[I_MSG_DELETE_MAP]),
MB_ICONQUESTION or MB_YESNO or
- MB_TASKMODAL or MB_DEFBUTTON2) <> mrYes then
+ MB_DEFBUTTON2) <> mrYes then
Exit;
Exit;
- WAD.RemoveResource('', MapName);
+ WAD.RemoveResource('', utf2win(MapName));
MessageBox(0, PChar(Format(_lc[I_MSG_MAP_DELETED_PROMT],
[MapName])),
PChar(_lc[I_MSG_MAP_DELETED]),
MB_ICONINFORMATION or MB_OK or
MessageBox(0, PChar(Format(_lc[I_MSG_MAP_DELETED_PROMT],
[MapName])),
PChar(_lc[I_MSG_MAP_DELETED]),
MB_ICONINFORMATION or MB_OK or
- MB_TASKMODAL or MB_DEFBUTTON1);
+ MB_DEFBUTTON1);
WAD.SaveTo(OpenDialog.FileName);
WAD.SaveTo(OpenDialog.FileName);
var Key: Word; Shift: TShiftState);
begin
if Key = VK_RETURN then
var Key: Word; Shift: TShiftState);
begin
if Key = VK_RETURN then
- bApplyProperty.Click();
+ vleObjectPropertyApply(Sender);
end;
procedure MovePanel(var ID: DWORD; MoveType: Byte);
end;
procedure MovePanel(var ID: DWORD; MoveType: Byte);
procedure TMainForm.OnIdle(Sender: TObject; var Done: Boolean);
begin
procedure TMainForm.OnIdle(Sender: TObject; var Done: Boolean);
begin
+ // FIXME: this is a shitty hack
+ if not gDataLoaded then
+ begin
+ e_WriteLog('Init OpenGL', MSG_NOTIFY);
+ e_InitGL();
+ e_WriteLog('Loading data', MSG_NOTIFY);
+ LoadStdFont('STDTXT', 'STDFONT', gEditorFont);
+ e_WriteLog('Loading more data', MSG_NOTIFY);
+ LoadData();
+ e_WriteLog('Loading even more data', MSG_NOTIFY);
+ gDataLoaded := True;
+ MainForm.FormResize(nil);
+ end;
Draw();
end;
procedure TMainForm.miMapPreviewClick(Sender: TObject);
begin
Draw();
end;
procedure TMainForm.miMapPreviewClick(Sender: TObject);
begin
- if not PreviewMode then
+ if PreviewMode = 2 then
+ Exit;
+
+ if PreviewMode = 0 then
begin
Splitter2.Visible := False;
Splitter1.Visible := False;
begin
Splitter2.Visible := False;
Splitter1.Visible := False;
sbVertical.Visible := True;
end;
sbVertical.Visible := True;
end;
- PreviewMode := not PreviewMode;
- (Sender as TMenuItem).Checked := PreviewMode;
+ PreviewMode := PreviewMode xor 1;
+ (Sender as TMenuItem).Checked := PreviewMode > 0;
+
+ FormResize(Self);
end;
procedure TMainForm.miLayer1Click(Sender: TObject);
end;
procedure TMainForm.miLayer1Click(Sender: TObject);
procedure TMainForm.miTestMapClick(Sender: TObject);
var
procedure TMainForm.miTestMapClick(Sender: TObject);
var
- cmd, mapWAD, mapToRun: String;
+ cmd, mapWAD, mapToRun, tempWAD: String;
opt: LongWord;
time: Integer;
opt: LongWord;
time: Integer;
- lpMsgBuf: PChar;
+ proc: TProcessUTF8;
+ res: Boolean;
begin
begin
+ mapToRun := '';
+ if OpenedMap <> '' then
+ begin
+ // Указываем текущую карту для теста:
+ g_ProcessResourceStr(OpenedMap, @mapWAD, nil, @mapToRun);
+ mapToRun := mapWAD + ':\' + mapToRun;
+ mapToRun := ExtractRelativePath(ExtractFilePath(TestD2dExe) + 'maps/', mapToRun);
+ end;
// Сохраняем временную карту:
time := 0;
repeat
// Сохраняем временную карту:
time := 0;
repeat
- mapWAD := ExtractFilePath(TestD2dExe) + Format('maps\temp%.4d.wad', [time]);
+ mapWAD := ExtractFilePath(TestD2dExe) + Format('maps/temp%.4d.wad', [time]);
Inc(time);
until not FileExists(mapWAD);
Inc(time);
until not FileExists(mapWAD);
- mapToRun := mapWAD + ':\' + TEST_MAP_NAME;
- SaveMap(mapToRun);
+ tempWAD := mapWAD + ':\' + TEST_MAP_NAME;
+ SaveMap(tempWAD);
- mapToRun := ExtractRelativePath(ExtractFilePath(TestD2dExe) + 'maps\', mapToRun);
+ tempWAD := ExtractRelativePath(ExtractFilePath(TestD2dExe) + 'maps/', tempWAD);
+// Если карта не была открыта, указываем временную в качестве текущей:
+ if mapToRun = '' then
+ mapToRun := tempWAD;
// Опции игры:
opt := 32 + 64;
// Опции игры:
opt := 32 + 64;
opt := opt + 16;
// Составляем командную строку:
opt := opt + 16;
// Составляем командную строку:
- cmd := ' -map "' + mapToRun + '"';
+ cmd := '-map "' + mapToRun + '"';
+ cmd := cmd + ' -testmap "' + tempWAD + '"';
cmd := cmd + ' -gm ' + TestGameMode;
cmd := cmd + ' -limt ' + TestLimTime;
cmd := cmd + ' -lims ' + TestLimScore;
cmd := cmd + ' -gm ' + TestGameMode;
cmd := cmd + ' -limt ' + TestLimTime;
cmd := cmd + ' -lims ' + TestLimScore;
cmd := cmd + ' --close';
cmd := cmd + ' --debug';
cmd := cmd + ' --close';
cmd := cmd + ' --debug';
- cmd := cmd + ' --tempdelete';
// Запускаем:
// Запускаем:
- Application.Minimize();
- if ExecuteProcess(TestD2dExe, cmd) < 0 then
+ proc := TProcessUTF8.Create(nil);
+ proc.Executable := TestD2dExe;
+ proc.Parameters.Add(cmd);
+ res := True;
+ try
+ proc.Execute();
+ except
+ res := False;
+ end;
+ if res then
begin
begin
- FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER or FORMAT_MESSAGE_FROM_SYSTEM,
- nil, GetLastError(), LANG_SYSTEM_DEFAULT,
- @lpMsgBuf, 0, nil);
- MessageBox(0, lpMsgBuf,
+ Application.Minimize();
+ proc.WaitOnExit();
+ end;
+ if (not res) or (proc.ExitCode < 0) then
+ begin
+ MessageBox(0, 'FIXME',
PChar(_lc[I_MSG_EXEC_ERROR]),
MB_OK or MB_ICONERROR);
end;
PChar(_lc[I_MSG_EXEC_ERROR]),
MB_OK or MB_ICONERROR);
end;
+ proc.Free();
SysUtils.DeleteFile(mapWAD);
Application.Restore();
SysUtils.DeleteFile(mapWAD);
Application.Restore();
(Key = Ord('V')) then
FillProperty();
end;
(Key = Ord('V')) then
FillProperty();
end;
-end;
-
-{
-procedure TMainForm.lbTextureListDrawItem(Control: TWinControl; Index: Integer;
- Rect: TRect; State: LCLType.TOwnerDrawState);
-begin
- with Control as TListBox do
+// Быстрое превью карты:
+ if Key = Ord('E') then
begin
begin
- if LCLType.odSelected in State then
- begin
- Canvas.Brush.Color := clHighlight;
- Canvas.Font.Color := clHighlightText;
- end else
- if (Items <> nil) and (Index >= 0) then
- if slInvalidTextures.IndexOf(Items[Index]) > -1 then
- begin
- Canvas.Brush.Color := clRed;
- Canvas.Font.Color := clWhite;
- end;
- Canvas.FillRect(Rect);
- Canvas.TextRect(Rect, Rect.Left, Rect.Top, Items[Index]);
+ if PreviewMode = 2 then
+ PreviewMode := 0;
end;
end;
end;
end;
-}
+
end.
end.