diff --git a/src/editor/f_main.pas b/src/editor/f_main.pas
index e2635344a0977677c10d8bf4e71ec0a2470fcfb9..ea7b4a9f7ed7e9e06909419ab9de7680ff8e377d 100644 (file)
--- a/src/editor/f_main.pas
+++ b/src/editor/f_main.pas
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_language, f_selectlang, ClipBrd;
+ g_language, f_selectlang, ClipBrd, g_resources;
const
UNDO_DELETE_PANEL = 1;
cwdt, chgt: Byte;
spc: ShortInt;
ID: DWORD;
- wad: TWADEditor_1;
cfgdata: Pointer;
cfglen: Integer;
config: TConfig;
begin
- cfgdata := nil;
- cfglen := 0;
ID := 0;
-
- wad := TWADEditor_1.Create;
- if wad.ReadFile(EditorDir+'data/Game.wad') then
- wad.GetResource('FONTS', cfgres, cfgdata, cfglen);
- wad.Free();
-
- if cfglen <> 0 then
+ g_ReadResource(EditorDir + 'data/Game.wad', 'FONTS', cfgres, cfgdata, cfglen);
+ if cfgdata <> nil then
begin
- if not g_CreateTextureWAD('FONT_STD', EditorDir+'data/Game.wad:FONTS\'+texture) then
+ if not g_CreateTextureWAD('FONT_STD', EditorDir + 'data/Game.wad:FONTS\' + texture) then
e_WriteLog('ERROR ERROR ERROR', MSG_WARNING);
config := TConfig.CreateMem(cfgdata, cfglen);
spc := Min(Max(config.ReadInt('FontMap', 'Kerning', 0), -128), 127);
if g_GetTexture('FONT_STD', ID) then
- e_TextureFontBuild(ID, FontID, cwdt, chgt, spc-2);
+ e_TextureFontBuild(ID, FontID, cwdt, chgt, spc - 2);
config.Free();
+ FreeMem(cfgdata)
end
else
- e_WriteLog('Could not load FONT_STD', MSG_WARNING);
-
- if cfglen <> 0 then FreeMem(cfgdata);
+ begin
+ e_WriteLog('Could not load FONT_STD', MSG_WARNING)
+ end
end;
procedure TMainForm.FormCreate(Sender: TObject);
begin
if (MouseLDown or MouseRDown) and (Position >= DotStep) then
begin
+ if DrawRect <> nil then
+ begin
+ Inc(MouseLDownPos.y, DotStep);
+ Inc(MouseRDownPos.y, DotStep);
+ end;
Dec(WASDOffset.Y, DotStep);
RenderPanelMouseMove(Sender, Shift, RenderMousePos().X, RenderMousePos().Y);
end;
begin
if (MouseLDown or MouseRDown) and (Position+DotStep <= Max) then
begin
+ if DrawRect <> nil then
+ begin
+ Dec(MouseLDownPos.y, DotStep);
+ Dec(MouseRDownPos.y, DotStep);
+ end;
Inc(WASDOffset.Y, DotStep);
RenderPanelMouseMove(Sender, Shift, RenderMousePos().X, RenderMousePos().Y);
end;
begin
if (MouseLDown or MouseRDown) and (Position >= DotStep) then
begin
+ if DrawRect <> nil then
+ begin
+ Inc(MouseLDownPos.x, DotStep);
+ Inc(MouseRDownPos.x, DotStep);
+ end;
Dec(WASDOffset.X, DotStep);
RenderPanelMouseMove(Sender, Shift, RenderMousePos().X, RenderMousePos().Y);
end;
begin
if (MouseLDown or MouseRDown) and (Position+DotStep <= Max) then
begin
+ if DrawRect <> nil then
+ begin
+ Dec(MouseLDownPos.x, DotStep);
+ Dec(MouseRDownPos.x, DotStep);
+ end;
Inc(WASDOffset.X, DotStep);
RenderPanelMouseMove(Sender, Shift, RenderMousePos().X, RenderMousePos().Y);
end;