X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-editor.git;a=blobdiff_plain;f=src%2Feditor%2Ff_main.pas;h=82bd18dec1de2ee47bb2044fb12b491f2c8e6527;hp=070939d11262449427ddd618720d851addd242b1;hb=fe7bb30e30aa2c6d52bb6ad641b5f0ae10de329e;hpb=797ba76501e5360f4d02d6aade613dc529a24213 diff --git a/src/editor/f_main.pas b/src/editor/f_main.pas index 070939d..82bd18d 100644 --- a/src/editor/f_main.pas +++ b/src/editor/f_main.pas @@ -26,6 +26,7 @@ type miSaveMapAs: TMenuItem; miOpenWadMap: TMenuItem; miLine1: TMenuItem; + miReopenMap: TMenuItem; miSaveMiniMap: TMenuItem; miDeleteMap: TMenuItem; miPackMap: TMenuItem; @@ -210,6 +211,7 @@ type procedure lbTextureListClick(Sender: TObject); procedure lbTextureListDrawItem(Control: TWinControl; Index: Integer; ARect: TRect; State: TOwnerDrawState); + procedure miReopenMapClick(Sender: TObject); 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); @@ -385,7 +387,7 @@ const SELECTFLAG_SHOTPANEL = 7; SELECTFLAG_SELECTED = 8; - RECENT_FILES_MENU_START = 11; + RECENT_FILES_MENU_START = 12; CLIPBOARD_SIG = 'DF:ED'; @@ -1907,6 +1909,9 @@ begin else SectionName := aSection; + if aWAD = '' then + aWAD := _lc[I_WAD_SPECIAL_MAP]; + if aWAD = _lc[I_WAD_SPECIAL_MAP] then begin // Файл карты g_ProcessResourceStr(OpenedMap, @fn, nil, nil); @@ -1965,14 +1970,21 @@ begin begin // Аним. текстура GetFrame(FullResourceName, Data, FrameLen, Width, Height); - if g_CreateTextureMemorySize(Data, FrameLen, ResourceName, 0, 0, Width, Height, 1) then - a := MainForm.lbTextureList.Items.Add(ResourceName); + if not g_CreateTextureMemorySize(Data, FrameLen, ResourceName, 0, 0, Width, Height, 1) then + ok := False; + a := MainForm.lbTextureList.Items.Add(ResourceName); end else // Обычная текстура begin - if g_CreateTextureWAD(ResourceName, FullResourceName) then - a := MainForm.lbTextureList.Items.Add(ResourceName); + if not g_CreateTextureWAD(ResourceName, FullResourceName) then + ok := False; + a := MainForm.lbTextureList.Items.Add(ResourceName); end; + if (not ok) and (slInvalidTextures.IndexOf(ResourceName) = -1) then + begin + slInvalidTextures.Add(ResourceName); + ok := True; + end; if (a > -1) and (not silent) then SelectTexture(a); end; @@ -2331,7 +2343,8 @@ begin Result := Res; end; -procedure StringToCopyBuffer(Str: String; var CopyBuf: TCopyRecArray); +procedure StringToCopyBuffer(Str: String; var CopyBuf: TCopyRecArray; + var pmin: TPoint); var i, j, t: Integer; @@ -2413,6 +2426,8 @@ begin PanelType := StrToIntDef(GetNext(), PANEL_WALL); X := StrToIntDef(GetNext(), 0); Y := StrToIntDef(GetNext(), 0); + pmin.X := Min(X, pmin.X); + pmin.Y := Min(Y, pmin.Y); Width := StrToIntDef(GetNext(), 16); Height := StrToIntDef(GetNext(), 16); TextureName := GetNext(); @@ -2427,6 +2442,8 @@ begin ItemType := StrToIntDef(GetNext(), ITEM_MEDKIT_SMALL); X := StrToIntDef(GetNext(), 0); Y := StrToIntDef(GetNext(), 0); + pmin.X := Min(X, pmin.X); + pmin.Y := Min(Y, pmin.Y); OnlyDM := (GetNext() = '1'); Fall := (GetNext() = '1'); end; @@ -2437,6 +2454,8 @@ begin MonsterType := StrToIntDef(GetNext(), MONSTER_DEMON); X := StrToIntDef(GetNext(), 0); Y := StrToIntDef(GetNext(), 0); + pmin.X := Min(X, pmin.X); + pmin.Y := Min(Y, pmin.Y); if GetNext() = '1' then Direction := D_LEFT @@ -2450,6 +2469,8 @@ begin AreaType := StrToIntDef(GetNext(), AREA_PLAYERPOINT1); X := StrToIntDef(GetNext(), 0); Y := StrToIntDef(GetNext(), 0); + pmin.X := Min(X, pmin.X); + pmin.Y := Min(Y, pmin.Y); if GetNext() = '1' then Direction := D_LEFT else @@ -2462,6 +2483,8 @@ begin TriggerType := StrToIntDef(GetNext(), TRIGGER_EXIT); X := StrToIntDef(GetNext(), 0); Y := StrToIntDef(GetNext(), 0); + pmin.X := Min(X, pmin.X); + pmin.Y := Min(Y, pmin.Y); Width := StrToIntDef(GetNext(), 16); Height := StrToIntDef(GetNext(), 16); ActivateType := StrToIntDef(GetNext(), 0); @@ -2471,6 +2494,34 @@ begin for j := 0 to 127 do Data.Default[j] := StrToIntDef(GetNext(), 0); + + case TriggerType of + TRIGGER_TELEPORT: + begin + pmin.X := Min(Data.TargetPoint.X, pmin.X); + pmin.Y := Min(Data.TargetPoint.Y, pmin.Y); + end; + TRIGGER_PRESS, TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF: + begin + pmin.X := Min(Data.tX, pmin.X); + pmin.Y := Min(Data.tY, pmin.Y); + end; + TRIGGER_SPAWNMONSTER: + begin + pmin.X := Min(Data.MonPos.X, pmin.X); + pmin.Y := Min(Data.MonPos.Y, pmin.Y); + end; + TRIGGER_SPAWNITEM: + begin + pmin.X := Min(Data.ItemPos.X, pmin.X); + pmin.Y := Min(Data.ItemPos.Y, pmin.Y); + end; + TRIGGER_SHOT: + begin + pmin.X := Min(Data.ShotPos.X, pmin.X); + pmin.Y := Min(Data.ShotPos.Y, pmin.Y); + end; + end; end; end; end; @@ -4285,6 +4336,15 @@ begin MapOffset.X := -Round(Position/16) * 16; end; end; + end + else // ssCtrl in Shift + begin + if ssShift in Shift then + begin + // Вставка по абсолютному смещению: + if Key = Ord('V') then + aPasteObjectExecute(Sender); + end; end; end; @@ -4491,6 +4551,21 @@ begin end; end; +procedure TMainForm.miReopenMapClick(Sender: TObject); +var + FileName, Resource: String; +begin + if OpenedMap = '' then + Exit; + + if MessageBox(0, PChar(_lc[I_MSG_REOPEN_MAP_PROMT]), + PChar(_lc[I_MENU_FILE_REOPEN]), MB_ICONQUESTION or MB_YESNO) <> idYes then + Exit; + + g_ProcessResourceStr(OpenedMap, @FileName, nil, @Resource); + OpenMap(FileName, Resource); +end; + procedure TMainForm.vleObjectPropertyGetPickList(Sender: TObject; const KeyName: String; Values: TStrings); begin @@ -5365,12 +5440,18 @@ procedure TMainForm.aPasteObjectExecute(Sender: TObject); var a, h: Integer; CopyBuffer: TCopyRecArray; - res: Boolean; + res, rel: Boolean; swad, ssec, sres: String; + NoTextureID: DWORD; + pmin: TPoint; begin CopyBuffer := nil; + NoTextureID := 0; + pmin.X := High(pmin.X); + pmin.Y := High(pmin.Y); - StringToCopyBuffer(ClipBoard.AsText, CopyBuffer); + StringToCopyBuffer(ClipBoard.AsText, CopyBuffer, pmin); + rel := not(ssShift in GetKeyShiftState()); if CopyBuffer = nil then Exit; @@ -5385,8 +5466,11 @@ begin OBJECT_PANEL: if Panel <> nil then begin - Panel^.X := Panel^.X + 16; - Panel^.Y := Panel^.Y + 16; + if rel then + begin + Panel^.X := Panel^.X - pmin.X - MapOffset.X + 32; + Panel^.Y := Panel^.Y - pmin.Y - MapOffset.Y + 32; + end; Panel^.TextureID := TEXTURE_SPECIAL_NONE; Panel^.TextureWidth := 1; @@ -5418,7 +5502,11 @@ begin g_GetTextureSizeByName(Panel^.TextureName, Panel^.TextureWidth, Panel^.TextureHeight) else - Panel^.TextureName := ''; + if g_GetTexture('NOTEXTURE', NoTextureID) then + begin + Panel^.TextureID := TEXTURE_SPECIAL_NOTEXTURE; + g_GetTextureSizeByID(NoTextureID, Panel^.TextureWidth, Panel^.TextureHeight); + end; end else // Спец.текстура: begin @@ -5437,8 +5525,11 @@ begin OBJECT_ITEM: begin - Item.X := Item.X + 16; - Item.Y := Item.Y + 16; + if rel then + begin + Item.X := Item.X - pmin.X - MapOffset.X + 32; + Item.Y := Item.Y - pmin.Y - MapOffset.Y + 32; + end; ID := AddItem(Item); Undo_Add(OBJECT_ITEM, ID, a > 0); @@ -5447,8 +5538,11 @@ begin OBJECT_MONSTER: begin - Monster.X := Monster.X + 16; - Monster.Y := Monster.Y + 16; + if rel then + begin + Monster.X := Monster.X - pmin.X - MapOffset.X + 32; + Monster.Y := Monster.Y - pmin.Y - MapOffset.Y + 32; + end; ID := AddMonster(Monster); Undo_Add(OBJECT_MONSTER, ID, a > 0); @@ -5457,8 +5551,11 @@ begin OBJECT_AREA: begin - Area.X := Area.X + 16; - Area.Y := Area.Y + 16; + if rel then + begin + Area.X := Area.X - pmin.X - MapOffset.X + 32; + Area.Y := Area.Y - pmin.Y - MapOffset.Y + 32; + end; ID := AddArea(Area); Undo_Add(OBJECT_AREA, ID, a > 0); @@ -5467,8 +5564,48 @@ begin OBJECT_TRIGGER: begin - Trigger.X := Trigger.X + 16; - Trigger.Y := Trigger.Y + 16; + if rel then + with Trigger do + begin + X := X - pmin.X - MapOffset.X + 32; + Y := Y - pmin.Y - MapOffset.Y + 32; + + case TriggerType of + TRIGGER_TELEPORT: + begin + Data.TargetPoint.X := + Data.TargetPoint.X - pmin.X - MapOffset.X + 32; + Data.TargetPoint.Y := + Data.TargetPoint.Y - pmin.Y - MapOffset.Y + 32; + end; + TRIGGER_PRESS, TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF: + begin + Data.tX := Data.tX - pmin.X - MapOffset.X + 32; + Data.tY := Data.tY - pmin.Y - MapOffset.Y + 32; + end; + TRIGGER_SPAWNMONSTER: + begin + Data.MonPos.X := + Data.MonPos.X - pmin.X - MapOffset.X + 32; + Data.MonPos.Y := + Data.MonPos.Y - pmin.Y - MapOffset.Y + 32; + end; + TRIGGER_SPAWNITEM: + begin + Data.ItemPos.X := + Data.ItemPos.X - pmin.X - MapOffset.X + 32; + Data.ItemPos.Y := + Data.ItemPos.Y - pmin.Y - MapOffset.Y + 32; + end; + TRIGGER_SHOT: + begin + Data.ShotPos.X := + Data.ShotPos.X - pmin.X - MapOffset.X + 32; + Data.ShotPos.Y := + Data.ShotPos.Y - pmin.Y - MapOffset.Y + 32; + end; + end; + end; ID := AddTrigger(Trigger); Undo_Add(OBJECT_TRIGGER, ID, a > 0);