X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_gui.pas;h=9319e45a7b9e29550da578fa07bf4af5ac32dc25;hb=af3c404e11867c6794975f1d45dd98932d804ede;hp=08ecee3316b007a783f681974e47f58785f7fbe3;hpb=385ab1e1ecb587ed8dfd1425381cd6f1c185e804;p=d2df-sdl.git diff --git a/src/game/g_gui.pas b/src/game/g_gui.pas index 08ecee3..9319e45 100644 --- a/src/game/g_gui.pas +++ b/src/game/g_gui.pas @@ -1,9 +1,10 @@ +{$MODE DELPHI} unit g_gui; interface uses - e_graphics, e_input, g_playermodel, g_basic, MAPSTRUCT, WADEDITOR; + e_graphics, e_input, g_playermodel, g_basic, MAPSTRUCT, wadreader; const MAINMENU_HEADER_COLOR: TRGB = (R:255; G:255; B:255); @@ -98,6 +99,7 @@ type FEnabled: Boolean; FWindow : TGUIWindow; FName: string; + FUserData: Pointer; public constructor Create; procedure OnMessage(var Msg: TMessage); virtual; @@ -107,6 +109,7 @@ type property Y: Integer read FY write FY; property Enabled: Boolean read FEnabled write FEnabled; property Name: string read FName write FName; + property UserData: Pointer read FUserData write FUserData; end; TGUIWindow = class @@ -152,6 +155,7 @@ type FShowWindow: string; public Proc: procedure; + ProcEx: procedure (sender: TGUITextButton); constructor Create(Proc: Pointer; FontID: DWORD; Text: string); destructor Destroy(); override; procedure OnMessage(var Msg: TMessage); override; @@ -451,6 +455,7 @@ type FCounter: Byte; FAlign: Boolean; FLeft: Integer; + FYesNo: Boolean; function NewItem(): Integer; public constructor Create(HeaderFont, ItemsFont: DWORD; Header: string); @@ -476,6 +481,7 @@ type procedure UpdateIndex(); property Align: Boolean read FAlign write FAlign; property Left: Integer read FLeft write FLeft; + property YesNo: Boolean read FYesNo write FYesNo; end; var @@ -833,13 +839,12 @@ end; procedure TGUITextButton.Click(Silent: Boolean = False); begin - if (FSound <> '') and (not Silent) then - g_Sound_PlayEx(FSound); + if (FSound <> '') and (not Silent) then g_Sound_PlayEx(FSound); + + if @Proc <> nil then Proc(); + if @ProcEx <> nil then ProcEx(self); - if @Proc <> nil then - Proc(); - if FShowWindow <> '' then - g_GUI_ShowWindow(FShowWindow); + if FShowWindow <> '' then g_GUI_ShowWindow(FShowWindow); end; constructor TGUITextButton.Create(Proc: Pointer; FontID: DWORD; Text: string); @@ -847,6 +852,7 @@ begin inherited Create(); Self.Proc := Proc; + ProcEx := nil; FFont := TFont.Create(FontID, FONT_CHAR); @@ -1254,9 +1260,13 @@ begin with FItems[i] do begin Text := TGUILabel.Create(l[a], FFontID); - with Text do + if FYesNo then begin - FColor := MENU_ITEMSTEXT_COLOR; + with Text do begin FColor := _RGB(255, 0, 0); end; + end + else + begin + with Text do begin FColor := MENU_ITEMSTEXT_COLOR; end; end; Control := nil; @@ -1289,6 +1299,7 @@ begin FFontID := ItemsFont; FCounter := MENU_MARKERDELAY; FAlign := True; + FYesNo := false; FHeader := TGUILabel.Create(Header, HeaderFont); with FHeader do @@ -1473,11 +1484,26 @@ begin IK_RETURN, IK_KPRETURN: begin if FIndex <> -1 then - if FItems[FIndex].Control <> nil then - FItems[FIndex].Control.OnMessage(Msg); - + begin + if FItems[FIndex].Control <> nil then FItems[FIndex].Control.OnMessage(Msg); + end; g_Sound_PlayEx(MENU_CLICKSOUND); end; + // dirty hacks + IK_Y: + if FYesNo and (length(FItems) > 1) then + begin + Msg.wParam := IK_RETURN; // to register keypress + FIndex := High(FItems)-1; + if FItems[FIndex].Control <> nil then FItems[FIndex].Control.OnMessage(Msg); + end; + IK_N: + if FYesNo and (length(FItems) > 1) then + begin + Msg.wParam := IK_RETURN; // to register keypress + FIndex := High(FItems); + if FItems[FIndex].Control <> nil then FItems[FIndex].Control.OnMessage(Msg); + end; end; end; end; @@ -1526,21 +1552,22 @@ begin cx := 0; for a := 0 to High(FItems) do + begin with FItems[a] do begin if (Text <> nil) and (Control = nil) then Continue; - w := 0; if Text <> nil then w := tx+Text.GetWidth; - if w > cx then cx := w; end; + end; cx := cx+MENU_HSPACE; h := FHeader.GetHeight*2+MENU_VSPACE*(Length(FItems)-1); for a := 0 to High(FItems) do + begin with FItems[a] do begin if (ControlType = TGUIListBox) or (ControlType = TGUIFileListBox) then @@ -1548,6 +1575,7 @@ begin else h := h+e_CharFont_GetMaxHeight(FFontID); end; + end; h := (gScreenHeight div 2)-(h div 2); @@ -1589,6 +1617,30 @@ begin else Inc(h, e_CharFont_GetMaxHeight(FFontID)+MENU_VSPACE); end; + + // another ugly hack + if FYesNo and (length(FItems) > 1) then + begin + w := -1; + for a := High(FItems)-1 to High(FItems) do + begin + if (FItems[a].Control <> nil) and (FItems[a].ControlType = TGUITextButton) then + begin + cx := (FItems[a].Control as TGUITextButton).GetWidth; + if cx > w then w := cx; + end; + end; + if w > 0 then + begin + for a := High(FItems)-1 to High(FItems) do + begin + if (FItems[a].Control <> nil) and (FItems[a].ControlType = TGUITextButton) then + begin + FItems[a].Control.FX := (gScreenWidth-w) div 2; + end; + end; + end; + end; end; function TGUIMenu.AddScroll(fText: string): TGUIScroll; @@ -2412,26 +2464,27 @@ end; procedure TGUIMapPreview.SetMap(Res: string); var - WAD: TWADEditor_1; + WAD: TWADFile; MapReader: TMapReader_1; panels: TPanelsRec1Array; header: TMapHeaderRec_1; a: Integer; - FileName, SectionName, ResName: string; + FileName: string; Data: Pointer; Len: Integer; rX, rY: Single; begin - g_ProcessResourceStr(Res, FileName, SectionName, ResName); + FileName := g_ExtractWadName(Res); - WAD := TWADEditor_1.Create(); + WAD := TWADFile.Create(); if not WAD.ReadFile(FileName) then begin WAD.Free(); Exit; end; - if not WAD.GetResource('', ResName, Data, Len) then + //k8: ignores path again + if not WAD.GetResource(g_ExtractFileName(Res), Data, Len) then begin WAD.Free(); Exit;