diff --git a/src/game/g_holmes.pas b/src/game/g_holmes.pas
index 570a1d99565d7d6e547b6418880d14011c80b86b..b7ad74b79db8028d84f2711100434655a9e5eebe 100644 (file)
--- a/src/game/g_holmes.pas
+++ b/src/game/g_holmes.pas
-(* Copyright (C) DooM 2D:Forever Developers
+(* Copyright (C) Doom 2D: Forever Developers
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
interface
-uses
- e_log, e_input,
- g_textures, g_basic, e_graphics, g_phys, g_grid, g_player, g_monsters,
- g_window, g_map, g_triggers, g_items, g_game, g_panel, g_console,
- xprofiler;
-
-
-type
- THMouseEvent = record
- public
- const
- // both for but and for bstate
- Left = $0001;
- Right = $0002;
- Middle = $0004;
- WheelUp = $0008;
- WheelDown = $0010;
-
- // event types
- Release = 0;
- Press = 1;
- Motion = 2;
-
- public
- kind: Byte; // motion, press, release
- x, y: Integer;
- dx, dy: Integer; // for wheel this is wheel motion, otherwise this is relative mouse motion
- but: Word; // current pressed/released button, or 0 for motion
- bstate: Word; // button state
- kstate: Word; // keyboard state (see THKeyEvent);
- end;
-
- THKeyEvent = record
- public
- const
- // modifiers
- ModCtrl = $0001;
- ModAlt = $0002;
- ModShift = $0004;
-
- // event types
- Release = 0;
- Press = 1;
-
- public
- kind: Byte;
- scan: Word; // SDL_SCANCODE_XXX
- sym: Word; // SDLK_XXX
- bstate: Word; // button state
- kstate: Word; // keyboard state
-
- public
- end;
-
-procedure g_Holmes_VidModeChanged ();
-procedure g_Holmes_WindowFocused ();
-procedure g_Holmes_WindowBlured ();
+ procedure holmesInitCommands ();
+ procedure holmesInitBinds ();
-procedure g_Holmes_Draw ();
-procedure g_Holmes_DrawUI ();
+ function monsTypeToString (mt: Byte): AnsiString;
+ function monsBehToString (bt: Byte): AnsiString;
+ function monsStateToString (st: Byte): AnsiString;
+ function trigType2Str (ttype: Integer): AnsiString;
-function g_Holmes_MouseEvent (var ev: THMouseEvent): Boolean; // returns `true` if event was eaten
-function g_Holmes_KeyEvent (var ev: THKeyEvent): Boolean; // returns `true` if event was eaten
-
-// hooks for player
-procedure g_Holmes_plrView (viewPortX, viewPortY, viewPortW, viewPortH: Integer);
-procedure g_Holmes_plrLaser (ax0, ay0, ax1, ay1: Integer);
-
-
-operator = (constref ev: THKeyEvent; const s: AnsiString): Boolean;
-operator = (const s: AnsiString; constref ev: THKeyEvent): Boolean;
-
-operator = (constref ev: THMouseEvent; const s: AnsiString): Boolean;
-operator = (const s: AnsiString; constref ev: THMouseEvent): Boolean;
+ var
+ g_holmes_imfunctional: Boolean = false;
+ g_holmes_enabled: Boolean = {$IF DEFINED(D2F_DEBUG)}true{$ELSE}false{$ENDIF};
+ var
+ msX: Integer = -666;
+ msY: Integer = -666;
+ showGrid: Boolean = {$IF DEFINED(D2F_DEBUG)}false{$ELSE}false{$ENDIF};
+ showMonsInfo: Boolean = false;
+ showMonsLOS2Plr: Boolean = false;
+ showAllMonsCells: Boolean = false;
+ showMapCurPos: Boolean = false;
+ showLayersWindow: Boolean = false;
+ showOutlineWindow: Boolean = false;
+ showTriggers: Boolean = {$IF DEFINED(D2F_DEBUG)}false{$ELSE}false{$ENDIF};
+ showTraceBox: Boolean = {$IF DEFINED(D2F_DEBUG)}false{$ELSE}false{$ENDIF};
-var
- g_holmes_enabled: Boolean = {$IF DEFINED(D2F_DEBUG)}true{$ELSE}false{$ENDIF};
+ var
+ g_ol_nice: Boolean = false;
+ g_ol_fill_walls: Boolean = false;
+ g_ol_rlayer_back: Boolean = false;
+ g_ol_rlayer_step: Boolean = false;
+ g_ol_rlayer_wall: Boolean = false;
+ g_ol_rlayer_door: Boolean = false;
+ g_ol_rlayer_acid1: Boolean = false;
+ g_ol_rlayer_acid2: Boolean = false;
+ g_ol_rlayer_water: Boolean = false;
+ g_ol_rlayer_fore: Boolean = false;
+ var
+ monMarkedUID: Integer = -1;
+ platMarkedGUID: Integer = -1;
implementation
uses
- {rttiobj,} typinfo,
- SysUtils, Classes, GL, SDL2,
- MAPDEF, g_main, g_options,
- utils, hashtable, xparser;
+ {mempool,}
+ e_log, e_input,
+ g_player, g_monsters,
+ g_map, g_triggers, g_game, g_panel, g_console,
+ {xprofiler,}
+ fui_common, fui_events, fui_ctls,
+ {$IFDEF ENABLE_RENDER}
+ r_render,
+ {$ENDIF}
+ {rttiobj,} typinfo, e_res,
+ SysUtils, Classes,
+ {$IFDEF USE_SDL2}
+ SDL2,
+ {$ENDIF}
+ MAPDEF, g_options,
+ hashtable, xparser;
var
//globalInited: Boolean = false;
- msX: Integer = -666;
- msY: Integer = -666;
msB: Word = 0; // button state
kbS: Word = 0; // keyboard modifiers state
- showGrid: Boolean = false;
- showMonsInfo: Boolean = false;
- showMonsLOS2Plr: Boolean = false;
- showAllMonsCells: Boolean = false;
- showMapCurPos: Boolean = false;
- showLayersWindow: Boolean = false;
- showOutlineWindow: Boolean = false;
- showTriggers: Boolean = {$IF DEFINED(D2F_DEBUG)}false{$ELSE}false{$ENDIF};
+
// ////////////////////////////////////////////////////////////////////////// //
{$INCLUDE g_holmes.inc}
-{$INCLUDE g_holmes_ui.inc}
// ////////////////////////////////////////////////////////////////////////// //
-// any mods = 255: nothing was defined
-function parseModKeys (const s: AnsiString; out kmods: Byte; out mbuts: Byte): AnsiString;
-var
- pos, epos: Integer;
-begin
- kmods := 255;
- mbuts := 255;
- pos := 1;
- //while (pos <= Length(s)) and (s[pos] <= ' ') do Inc(pos);
- if (pos < Length(s)) and ((s[pos] = '+') or (s[pos] = '-') or (s[pos] = '*')) then Inc(pos);
- while (pos < Length(s)) do
- begin
- if (Length(s)-pos >= 2) and (s[pos+1] = '-') then
- begin
- case s[pos] of
- 'C', 'c': begin if (kmods = 255) then kmods := 0; kmods := kmods or THKeyEvent.ModCtrl; Inc(pos, 2); continue; end;
- 'M', 'm': begin if (kmods = 255) then kmods := 0; kmods := kmods or THKeyEvent.ModAlt; Inc(pos, 2); continue; end;
- 'S', 's': begin if (kmods = 255) then kmods := 0; kmods := kmods or THKeyEvent.ModShift; Inc(pos, 2); continue; end;
- end;
- break;
- end;
- if (Length(s)-pos >= 4) and ((s[pos+1] = 'M') or (s[pos+1] = 'm')) and ((s[pos+2] = 'B') or (s[pos+1] = 'b')) and (s[pos+3] = '-') then
- begin
- case s[pos] of
- 'L', 'l': begin if (mbuts = 255) then mbuts := 0; mbuts := mbuts or THMouseEvent.Left; Inc(pos, 4); continue; end;
- 'R', 'r': begin if (mbuts = 255) then mbuts := 0; mbuts := mbuts or THMouseEvent.Right; Inc(pos, 4); continue; end;
- 'M', 'm': begin if (mbuts = 255) then mbuts := 0; mbuts := mbuts or THMouseEvent.Middle; Inc(pos, 4); continue; end;
- end;
- break;
- end;
- break;
- end;
- epos := Length(s)+1;
- while (epos > pos) and (s[epos-1] <= ' ') do Dec(epos);
- if (epos > pos) then result := Copy(s, pos, epos-pos) else result := '';
-end;
-
-
-operator = (constref ev: THKeyEvent; const s: AnsiString): Boolean;
-var
- f: Integer;
- kmods: Byte = 255;
- mbuts: Byte = 255;
- kname: AnsiString;
-begin
- result := false;
- if (Length(s) > 0) then
- begin
- if (s[1] = '+') then begin if (ev.kind <> ev.Press) then exit; end
- else if (s[1] = '-') then begin if (ev.kind <> ev.Release) then exit; end
- else if (s[1] = '*') then begin end
- else if (ev.kind <> ev.Press) then exit;
- end;
- kname := parseModKeys(s, kmods, mbuts);
- if (kmods = 255) then kmods := 0;
- if (ev.kstate <> kmods) then exit;
- if (mbuts <> 255) and (ev.bstate <> mbuts) then exit;
- for f := 1 to High(e_KeyNames) do
- begin
- if (CompareText(kname, e_KeyNames[f]) = 0) then
- begin
- result := (ev.scan = f);
- exit;
- end;
- end;
-end;
-
-
-operator = (const s: AnsiString; constref ev: THKeyEvent): Boolean;
-begin
- result := (ev = s);
-end;
-
-
-operator = (constref ev: THMouseEvent; const s: AnsiString): Boolean;
-var
- kmods: Byte = 255;
- mbuts: Byte = 255;
- kname: AnsiString;
- but: Integer = -1;
-begin
- result := false;
-
- if (Length(s) > 0) then
- begin
- if (s[1] = '+') then begin if (ev.kind <> ev.Press) then exit; end
- else if (s[1] = '-') then begin if (ev.kind <> ev.Release) then exit; end
- else if (s[1] = '*') then begin if (ev.kind <> ev.Motion) then exit; end
- else if (ev.kind <> ev.Press) then exit;
- end;
-
- kname := parseModKeys(s, kmods, mbuts);
- if (CompareText(kname, 'LMB') = 0) then but := THMouseEvent.Left
- else if (CompareText(kname, 'RMB') = 0) then but := THMouseEvent.Right
- else if (CompareText(kname, 'MMB') = 0) then but := THMouseEvent.Middle
- else if (CompareText(kname, 'None') = 0) then but := 0
- else exit;
-
- //conwritefln('s=[%s]; kname=[%s]; kmods=%s; mbuts=%s; but=%s', [s, kname, kmods, mbuts, but]);
-
- if (mbuts = 255) then mbuts := 0;
- if (kmods = 255) then kmods := 0;
- if (ev.kstate <> kmods) then exit;
-
- if (ev.kind = ev.Press) then mbuts := mbuts or but
- else if (ev.kind = ev.Release) then mbuts := mbuts and (not but);
-
- //conwritefln(' ev.bstate=%s; ev.but=%s; mbuts=%s', [ev.bstate, ev.but, mbuts]);
-
- result := (ev.bstate = mbuts) and (ev.but = but);
-end;
-
-
-operator = (const s: AnsiString; constref ev: THMouseEvent): Boolean;
-begin
- result := (ev = s);
-end;
+{$INCLUDE g_holmes_cmd.inc}
// ////////////////////////////////////////////////////////////////////////// //
-function typeKind2Str (t: TTypeKind): AnsiString;
+
+{$IF NOT DEFINED(ENABLE_RENDER)}
+function pmsCurMapX (): Integer; inline;
begin
- case t of
- tkUnknown: result := 'Unknown';
- tkInteger: result := 'Integer';
- tkChar: result := 'Char';
- tkEnumeration: result := 'Enumeration';
- tkFloat: result := 'Float';
- tkSet: result := 'Set';
- tkMethod: result := 'Method';
- tkSString: result := 'SString';
- tkLString: result := 'LString';
- tkAString: result := 'AString';
- tkWString: result := 'WString';
- tkVariant: result := 'Variant';
- tkArray: result := 'Array';
- tkRecord: result := 'Record';
- tkInterface: result := 'Interface';
- tkClass: result := 'Class';
- tkObject: result := 'Object';
- tkWChar: result := 'WChar';
- tkBool: result := 'Bool';
- tkInt64: result := 'Int64';
- tkQWord: result := 'QWord';
- tkDynArray: result := 'DynArray';
- tkInterfaceRaw: result := 'InterfaceRaw';
- tkProcVar: result := 'ProcVar';
- tkUString: result := 'UString';
- tkUChar: result := 'UChar';
- tkHelper: result := 'Helper';
- tkFile: result := 'File';
- tkClassRef: result := 'ClassRef';
- tkPointer: result := 'Pointer';
- else result := '<unknown>';
- end;
+ result := round(msX/g_dbg_scale)
end;
-
-procedure dumpPublishedProperties (obj: TObject);
-var
- pt: PTypeData;
- pi: PTypeInfo;
- i, j: Integer;
- pp: PPropList;
+function pmsCurMapY (): Integer; inline;
begin
- if (obj = nil) then exit;
- e_LogWritefln('Object of type ''%s'':', [obj.ClassName]);
- pi := obj.ClassInfo;
- pt := GetTypeData(pi);
- e_LogWritefln('property count: %s', [pt.PropCount]);
- GetMem(pp, pt^.PropCount*sizeof(Pointer));
- try
- j := GetPropList(pi, [tkInteger, tkBool, tkSString, tkLString, tkAString, tkSet, tkEnumeration], pp);
- //e_LogWritefln('ordinal property count: %s', [j]);
- for i := 0 to j-1 do
- begin
- if (typinfo.PropType(obj, pp^[i].name) in [tkSString, tkLString, tkAString]) then
- begin
- e_LogWritefln(' #%s: <%s>; type: %s; value: <%s>', [i+1, pp^[i].name, typeKind2Str(typinfo.PropType(obj, pp^[i].name)), GetStrProp(obj, pp^[i])]);
- end
- else if (typinfo.PropType(obj, pp^[i].name) = tkSet) then
- begin
- e_LogWritefln(' #%s: <%s>; type: %s; value: %s', [i+1, pp^[i].name, typeKind2Str(typinfo.PropType(obj, pp^[i].name)), GetSetProp(obj, pp^[i], true)]);
- end
- else if (typinfo.PropType(obj, pp^[i].name) = tkEnumeration) then
- begin
- e_LogWritefln(' #%s: <%s>; type: %s; value: <%s>', [i+1, pp^[i].name, typeKind2Str(typinfo.PropType(obj, pp^[i].name)), GetEnumProp(obj, pp^[i])]);
- end
- else
- begin
- e_LogWritefln(' #%s: <%s>; type: %s; value: %s', [i+1, pp^[i].name, typeKind2Str(typinfo.PropType(obj, pp^[i].name)), GetOrdProp(obj, pp^[i])]);
- end;
- end;
- finally
- FreeMem(pp);
- end;
+ result := round(msY/g_dbg_scale)
end;
-
-//FIXME: autogenerate
-function trigType2Str (ttype: Integer): AnsiString;
+function r_Render_HolmesViewIsSet (): Boolean;
begin
- result := '<unknown>';
- case ttype of
- TRIGGER_NONE: result := 'none';
- TRIGGER_EXIT: result := 'exit';
- TRIGGER_TELEPORT: result := 'teleport';
- TRIGGER_OPENDOOR: result := 'opendoor';
- TRIGGER_CLOSEDOOR: result := 'closedoor';
- TRIGGER_DOOR: result := 'door';
- TRIGGER_DOOR5: result := 'door5';
- TRIGGER_CLOSETRAP: result := 'closetrap';
- TRIGGER_TRAP: result := 'trap';
- TRIGGER_PRESS: result := 'press';
- TRIGGER_SECRET: result := 'secret';
- TRIGGER_LIFTUP: result := 'liftup';
- TRIGGER_LIFTDOWN: result := 'liftdown';
- TRIGGER_LIFT: result := 'lift';
- TRIGGER_TEXTURE: result := 'texture';
- TRIGGER_ON: result := 'on';
- TRIGGER_OFF: result := 'off';
- TRIGGER_ONOFF: result := 'onoff';
- TRIGGER_SOUND: result := 'sound';
- TRIGGER_SPAWNMONSTER: result := 'spawnmonster';
- TRIGGER_SPAWNITEM: result := 'spawnitem';
- TRIGGER_MUSIC: result := 'music';
- TRIGGER_PUSH: result := 'push';
- TRIGGER_SCORE: result := 'score';
- TRIGGER_MESSAGE: result := 'message';
- TRIGGER_DAMAGE: result := 'damage';
- TRIGGER_HEALTH: result := 'health';
- TRIGGER_SHOT: result := 'shot';
- TRIGGER_EFFECT: result := 'effect';
- TRIGGER_SCRIPT: result := 'script';
- end;
+ result := false
end;
-
-// ////////////////////////////////////////////////////////////////////////// //
-{$INCLUDE g_holmes_cmd.inc}
-procedure holmesInitCommands (); forward;
-procedure holmesInitBinds (); forward;
-
-
-// ////////////////////////////////////////////////////////////////////////// //
-var
- g_ol_nice: Boolean = false;
- g_ol_fill_walls: Boolean = false;
- g_ol_rlayer_back: Boolean = false;
- g_ol_rlayer_step: Boolean = false;
- g_ol_rlayer_wall: Boolean = false;
- g_ol_rlayer_door: Boolean = false;
- g_ol_rlayer_acid1: Boolean = false;
- g_ol_rlayer_acid2: Boolean = false;
- g_ol_rlayer_water: Boolean = false;
- g_ol_rlayer_fore: Boolean = false;
+{$ENDIF}
// ////////////////////////////////////////////////////////////////////////// //
var
- winHelp: THTopWindow = nil;
- winOptions: THTopWindow = nil;
- winLayers: THTopWindow = nil;
- winOutlines: THTopWindow = nil;
+ winHelp: TUITopWindow = nil;
+ winOptions: TUITopWindow = nil;
+ winLayers: TUITopWindow = nil;
+ winOutlines: TUITopWindow = nil;
procedure createHelpWindow (); forward;
procedure createOutlinesWindow (); forward;
-procedure toggleLayersWindowCB (me: THControl; checked: Integer);
+procedure toggleLayersWindowCB (me: TUIControl);
begin
+ showLayersWindow := not showLayersWindow;
if showLayersWindow then
begin
if (winLayers = nil) then createLayersWindow();
end;
end;
-
-procedure toggleOutlineWindowCB (me: THControl; checked: Integer);
+procedure toggleOutlineWindowCB (me: TUIControl);
begin
+ showOutlineWindow := not showOutlineWindow;
if showOutlineWindow then
begin
if (winOutlines = nil) then createOutlinesWindow();
procedure createHelpWindow ();
+ procedure addHelpEmptyLine ();
+ var
+ stx: TUIStaticText;
+ begin
+ stx := TUIStaticText.Create();
+ stx.flExpand := true;
+ stx.halign := 0; // center
+ stx.text := '';
+ stx.header := false;
+ stx.line := false;
+ winHelp.appendChild(stx);
+ end;
+
+ procedure addHelpCaptionLine (const txt: AnsiString);
+ var
+ stx: TUIStaticText;
+ begin
+ stx := TUIStaticText.Create();
+ stx.flExpand := true;
+ stx.halign := 0; // center
+ stx.text := txt;
+ stx.header := true;
+ stx.line := true;
+ winHelp.appendChild(stx);
+ end;
+
+ procedure addHelpCaption (const txt: AnsiString);
+ var
+ stx: TUIStaticText;
+ begin
+ stx := TUIStaticText.Create();
+ stx.flExpand := true;
+ stx.halign := 0; // center
+ stx.text := txt;
+ stx.header := true;
+ stx.line := false;
+ winHelp.appendChild(stx);
+ end;
+
+ procedure addHelpKeyMouse (const key, txt, grp: AnsiString);
+ var
+ box: TUIHBox;
+ span: TUISpan;
+ stx: TUIStaticText;
+ begin
+ box := TUIHBox.Create();
+ box.flExpand := true;
+ // key
+ stx := TUIStaticText.Create();
+ stx.flExpand := true;
+ stx.halign := 1; // right
+ stx.valign := 0; // center
+ stx.text := key;
+ stx.header := true;
+ stx.line := false;
+ stx.flHGroup := grp;
+ box.appendChild(stx);
+ // span
+ span := TUISpan.Create();
+ span.flDefaultSize := TLaySize.Create(12, 1);
+ span.flExpand := true;
+ box.appendChild(span);
+ // text
+ stx := TUIStaticText.Create();
+ stx.flExpand := true;
+ stx.halign := -1; // left
+ stx.valign := 0; // center
+ stx.text := txt;
+ stx.header := false;
+ stx.line := false;
+ box.appendChild(stx);
+ winHelp.appendChild(box);
+ end;
+
+ procedure addHelpKey (const key, txt: AnsiString); begin addHelpKeyMouse(key, txt, 'help-keys'); end;
+ procedure addHelpMouse (const key, txt: AnsiString); begin addHelpKeyMouse(key, txt, 'help-mouse'); end;
+
var
- llb: THCtlSimpleText;
slist: array of AnsiString = nil;
cmd: PHolmesCommand;
bind: THolmesBinding;
- f, maxkeylen: Integer;
+ f: Integer;
+ {
+ llb: TUISimpleText;
+ maxkeylen: Integer;
s: AnsiString;
+ }
begin
+ winHelp := TUITopWindow.Create('Holmes Help');
+ winHelp.escClose := true;
+ winHelp.flHoriz := false;
+
+ // keyboard
for cmd in cmdlist do cmd.helpmark := false;
- maxkeylen := 0;
+ //maxkeylen := 0;
for bind in keybinds do
begin
if (Length(bind.key) = 0) then continue;
if (Length(cmd.help) > 0) then
begin
cmd.helpmark := true;
- if (maxkeylen < Length(bind.key)) then maxkeylen := Length(bind.key);
+ //if (maxkeylen < Length(bind.key)) then maxkeylen := Length(bind.key);
end;
end;
end;
for cmd in cmdlist do
begin
if not cmd.helpmark then continue;
- if (Length(cmd.help) = 0) then continue;
+ if (Length(cmd.help) = 0) then begin cmd.helpmark := false; continue; end;
f := 0;
while (f < Length(slist)) and (CompareText(slist[f], cmd.section) <> 0) do Inc(f);
if (f = Length(slist)) then
end;
end;
- llb := THCtlSimpleText.Create(0, 0);
+ addHelpCaptionLine('KEYBOARD');
+ //llb := TUISimpleText.Create(0, 0);
for f := 0 to High(slist) do
begin
- if (f > 0) then llb.appendItem('');
- llb.appendItem(slist[f], true, true);
+ //if (f > 0) then llb.appendItem('');
+ if (f > 0) then addHelpEmptyLine();
+ //llb.appendItem(slist[f], true, true);
+ addHelpCaption(slist[f]);
for cmd in cmdlist do
begin
if not cmd.helpmark then continue;
if (Length(bind.key) = 0) then continue;
if (cmd.name = bind.cmdName) then
begin
- s := bind.key;
- while (Length(s) < maxkeylen) do s += ' ';
- s := ' '+s+' -- '+cmd.help;
- llb.appendItem(s);
+ //s := bind.key;
+ //while (Length(s) < maxkeylen) do s += ' ';
+ //s := ' '+s+' -- '+cmd.help;
+ //llb.appendItem(s);
+ addHelpMouse(bind.key, cmd.help);
end;
end;
end;
end;
- maxkeylen := 0;
+ // mouse
+ for cmd in cmdlist do cmd.helpmark := false;
+
+ //maxkeylen := 0;
for bind in msbinds do
begin
if (Length(bind.key) = 0) then continue;
if (Length(cmd.help) > 0) then
begin
cmd.helpmark := true;
- if (maxkeylen < Length(bind.key)) then maxkeylen := Length(bind.key);
+ //if (maxkeylen < Length(bind.key)) then maxkeylen := Length(bind.key);
end;
end;
end;
- llb.appendItem('');
- llb.appendItem('mouse', true, true);
+ //llb.appendItem('');
+ //llb.appendItem('mouse', true, true);
+ if (f > 0) then addHelpEmptyLine();
+ addHelpCaptionLine('MOUSE');
for bind in msbinds do
begin
if (Length(bind.key) = 0) then continue;
begin
if (Length(cmd.help) > 0) then
begin
- s := bind.key;
- while (Length(s) < maxkeylen) do s += ' ';
- s := ' '+s+' -- '+cmd.help;
- llb.appendItem(s);
+ //s := bind.key;
+ //while (Length(s) < maxkeylen) do s += ' ';
+ //s := ' '+s+' -- '+cmd.help;
+ //llb.appendItem(s);
+ addHelpKey(bind.key, cmd.help);
end;
end;
end;
- winHelp := THTopWindow.Create('Holmes Help', 10, 10);
+ //winHelp.appendChild(llb);
+
+ uiLayoutCtl(winHelp);
winHelp.escClose := true;
- winHelp.appendChild(llb);
winHelp.centerInScreen();
end;
-procedure winLayersClosed (me: THControl; dummy: Integer); begin showLayersWindow := false; end;
-procedure winOutlinesClosed (me: THControl; dummy: Integer); begin showOutlineWindow := false; end;
+procedure winLayersClosed (me: TUIControl); begin showLayersWindow := false; end;
+procedure winOutlinesClosed (me: TUIControl); begin showOutlineWindow := false; end;
-procedure createLayersWindow ();
+procedure addCheckBox (parent: TUIControl; const text: AnsiString; pvar: PBoolean; const aid: AnsiString='');
var
- llb: THCtlCBListBox;
+ cb: TUICheckBox;
begin
- llb := THCtlCBListBox.Create(0, 0);
- llb.appendItem('background', @g_rlayer_back);
- llb.appendItem('steps', @g_rlayer_step);
- llb.appendItem('walls', @g_rlayer_wall);
- llb.appendItem('doors', @g_rlayer_door);
- llb.appendItem('acid1', @g_rlayer_acid1);
- llb.appendItem('acid2', @g_rlayer_acid2);
- llb.appendItem('water', @g_rlayer_water);
- llb.appendItem('foreground', @g_rlayer_fore);
- winLayers := THTopWindow.Create('layers', 10, 10);
- winLayers.escClose := true;
- winLayers.appendChild(llb);
- winLayers.closeCB := winLayersClosed;
+ cb := TUICheckBox.Create();
+ cb.flExpand := true;
+ cb.setVar(pvar);
+ cb.text := text;
+ cb.id := aid;
+ parent.appendChild(cb);
end;
-
-procedure createOutlinesWindow ();
+procedure addButton (parent: TUIControl; const text: AnsiString; cb: TUIControl.TActionCB);
var
- llb: THCtlCBListBox;
+ but: TUIButton;
begin
- llb := THCtlCBListBox.Create(0, 0);
- llb.appendItem('background', @g_ol_rlayer_back);
- llb.appendItem('steps', @g_ol_rlayer_step);
- llb.appendItem('walls', @g_ol_rlayer_wall);
- llb.appendItem('doors', @g_ol_rlayer_door);
- llb.appendItem('acid1', @g_ol_rlayer_acid1);
- llb.appendItem('acid2', @g_ol_rlayer_acid2);
- llb.appendItem('water', @g_ol_rlayer_water);
- llb.appendItem('foreground', @g_ol_rlayer_fore);
- llb.appendItem('OPTIONS', nil);
- llb.appendItem('fill walls', @g_ol_fill_walls);
- llb.appendItem('contours', @g_ol_nice);
- winOutlines := THTopWindow.Create('outlines', 100, 10);
- winOutlines.escClose := true;
- winOutlines.appendChild(llb);
- winOutlines.closeCB := winOutlinesClosed;
+ but := TUIButton.Create();
+ //but.flExpand := true;
+ but.actionCB := cb;
+ but.text := text;
+ parent.appendChild(but);
end;
-procedure createOptionsWindow ();
-var
- llb: THCtlCBListBox;
+procedure actionFillWalls (cb: TUIControl);
begin
- llb := THCtlCBListBox.Create(0, 0);
- llb.appendItem('map grid', @showGrid);
- llb.appendItem('cursor position on map', @showMapCurPos);
- llb.appendItem('monster info', @showMonsInfo);
- llb.appendItem('monster LOS to player', @showMonsLOS2Plr);
- llb.appendItem('monster cells (SLOW!)', @showAllMonsCells);
- llb.appendItem('draw triggers (SLOW!)', @showTriggers);
- llb.appendItem('WINDOWS', nil);
- llb.appendItem('layers window', @showLayersWindow, toggleLayersWindowCB);
- llb.appendItem('outline window', @showOutlineWindow, toggleOutlineWindowCB);
- winOptions := THTopWindow.Create('Holmes Options', 100, 100);
- winOptions.escClose := true;
- winOptions.appendChild(llb);
- winOptions.centerInScreen();
+ TUICheckBox(cb).checked := not TUICheckBox(cb).checked;
+ TUICheckBox(cb.topLevel['cbcontour']).enabled := not TUICheckBox(cb).checked;
end;
-
-procedure toggleLayersWindow (arg: Integer=-1);
+procedure createLayersWindow ();
+var
+ box: TUIVBox;
begin
- showLayersWindow := not showLayersWindow;
- toggleLayersWindowCB(nil, 0);
-end;
+ winLayers := TUITopWindow.Create('layers');
+ winLayers.flHoriz := false;
+ winLayers.x0 := 10;
+ winLayers.y0 := 10;
+ winLayers.flHoriz := false;
+ winLayers.escClose := true;
+ winLayers.closeCB := winLayersClosed;
-procedure toggleOutlineWindow (arg: Integer=-1);
-begin
- showOutlineWindow := not showOutlineWindow;
- toggleOutlineWindowCB(nil, 0);
-end;
+ box := TUIVBox.Create();
+ addCheckBox(box, '~background', @g_rlayer_back);
+ addCheckBox(box, '~steps', @g_rlayer_step);
+ addCheckBox(box, '~walls', @g_rlayer_wall);
+ addCheckBox(box, '~doors', @g_rlayer_door);
+ addCheckBox(box, 'acid~1', @g_rlayer_acid1);
+ addCheckBox(box, 'acid~2', @g_rlayer_acid2);
+ addCheckBox(box, 'wate~r', @g_rlayer_water);
+ addCheckBox(box, '~foreground', @g_rlayer_fore);
+ winLayers.appendChild(box);
-procedure toggleHelpWindow (arg: Integer=-1);
-begin
- if (winHelp = nil) then createHelpWindow();
- if not uiVisibleWindow(winHelp) then uiAddWindow(winHelp) else uiRemoveWindow(winHelp);
+ uiLayoutCtl(winLayers);
end;
-procedure toggleOptionsWindow (arg: Integer=-1);
+
+procedure createOutlinesWindow ();
+var
+ box: TUIVBox;
begin
- if (winOptions = nil) then createOptionsWindow();
- if not uiVisibleWindow(winOptions) then uiAddWindow(winOptions) else uiRemoveWindow(winOptions);
-end;
+ winOutlines := TUITopWindow.Create('outlines');
+ winOutlines.flHoriz := false;
+ winOutlines.x0 := 100;
+ winOutlines.y0 := 30;
+ winOutlines.flHoriz := false;
+ winOutlines.escClose := true;
+ winOutlines.closeCB := winOutlinesClosed;
+ box := TUIVBox.Create();
+ box.hasFrame := true;
+ box.caption := 'layers';
+ addCheckBox(box, '~background', @g_ol_rlayer_back);
+ addCheckBox(box, '~steps', @g_ol_rlayer_step);
+ addCheckBox(box, '~walls', @g_ol_rlayer_wall);
+ addCheckBox(box, '~doors', @g_ol_rlayer_door);
+ addCheckBox(box, 'acid~1', @g_ol_rlayer_acid1);
+ addCheckBox(box, 'acid~2', @g_ol_rlayer_acid2);
+ addCheckBox(box, 'wate~r', @g_ol_rlayer_water);
+ addCheckBox(box, '~foreground', @g_ol_rlayer_fore);
+ winOutlines.appendChild(box);
-// ////////////////////////////////////////////////////////////////////////// //
-procedure g_Holmes_VidModeChanged ();
-begin
- e_WriteLog(Format('Holmes: videomode changed: %dx%d', [gScreenWidth, gScreenHeight]), MSG_NOTIFY);
- // texture space is possibly lost here, idc
- curtexid := 0;
- font6texid := 0;
- font8texid := 0;
- prfont6texid := 0;
- prfont8texid := 0;
- //createCursorTexture();
-end;
+ box := TUIVBox.Create();
+ box.hasFrame := true;
+ box.caption := 'options';
+ addCheckBox(box, 'fi~ll walls', @g_ol_fill_walls, 'cbfill');
+ addCheckBox(box, 'con~tours', @g_ol_nice, 'cbcontour');
+ winOutlines.appendChild(box);
-procedure g_Holmes_WindowFocused ();
-begin
- msB := 0;
- kbS := 0;
-end;
+ winOutlines.setActionCBFor('cbfill', actionFillWalls);
-procedure g_Holmes_WindowBlured ();
-begin
+ uiLayoutCtl(winOutlines);
end;
-// ////////////////////////////////////////////////////////////////////////// //
+procedure createOptionsWindow ();
var
- vpSet: Boolean = false;
- vpx, vpy: Integer;
- vpw, vph: Integer;
- laserSet: Boolean = false;
- laserX0, laserY0, laserX1, laserY1: Integer;
- monMarkedUID: Integer = -1;
-
-
-procedure g_Holmes_plrView (viewPortX, viewPortY, viewPortW, viewPortH: Integer);
+ box: TUIBox;
+ span: TUISpan;
begin
- vpSet := true;
- vpx := viewPortX;
- vpy := viewPortY;
- vpw := viewPortW;
- vph := viewPortH;
-end;
+ winOptions := TUITopWindow.Create('Holmes Options');
+ winOptions.flHoriz := false;
+ winOptions.flHoriz := false;
+ winOptions.escClose := true;
-procedure g_Holmes_plrLaser (ax0, ay0, ax1, ay1: Integer);
-begin
- laserSet := true;
- laserX0 := ax0;
- laserY0 := ay0;
- laserX1 := ax1;
- laserY1 := ay1;
- laserSet := laserSet; // shut up, fpc!
+ box := TUIVBox.Create();
+ box.hasFrame := true;
+ box.caption := 'visual';
+ addCheckBox(box, 'map ~grid', @showGrid);
+ addCheckBox(box, 'cursor ~position on map', @showMapCurPos);
+ addCheckBox(box, '~monster info', @showMonsInfo);
+ addCheckBox(box, 'monster LO~S to player', @showMonsLOS2Plr);
+ addCheckBox(box, 'monster ~cells (SLOW!)', @showAllMonsCells);
+ addCheckBox(box, 'draw ~triggers (SLOW!)', @showTriggers);
+ winOptions.appendChild(box);
+
+ box := TUIHBox.Create();
+ box.hasFrame := true;
+ box.caption := 'windows';
+ box.captionAlign := 0;
+ box.flAlign := 0;
+ addButton(box, '~layers', toggleLayersWindowCB);
+ span := TUISpan.Create();
+ span.flExpand := true;
+ span.flDefaultSize := TLaySize.Create(4, 1);
+ box.appendChild(span);
+ addButton(box, '~outline', toggleOutlineWindowCB);
+ winOptions.appendChild(box);
+
+ uiLayoutCtl(winOptions);
+ winOptions.centerInScreen();
end;
-function pmsCurMapX (): Integer; inline; begin result := round(msX/g_dbg_scale)+vpx; end;
-function pmsCurMapY (): Integer; inline; begin result := round(msY/g_dbg_scale)+vpy; end;
-
-
-procedure plrDebugMouse (var ev: THMouseEvent);
+procedure toggleLayersWindow (arg: Integer=-1);
begin
- //e_WriteLog(Format('mouse: x=%d; y=%d; but=%d; bstate=%d', [msx, msy, but, bstate]), MSG_NOTIFY);
- if (gPlayer1 = nil) or not vpSet then exit;
- //if (ev.kind <> THMouseEvent.Press) then exit;
- //e_WriteLog(Format('mev: %d', [Integer(ev.kind)]), MSG_NOTIFY);
- msbindExecute(ev);
+ if (arg < 0) then showLayersWindow := not showLayersWindow else showLayersWindow := (arg > 0);
+ showLayersWindow := not showLayersWindow; // hack for callback
+ toggleLayersWindowCB(nil);
end;
-
-var
- edgeBmp: array of Byte = nil;
-
-
-procedure drawOutlines ();
-var
- r, g, b: Integer;
-
- procedure clearEdgeBmp ();
- begin
- SetLength(edgeBmp, (gWinSizeX+4)*(gWinSizeY+4));
- FillChar(edgeBmp[0], Length(edgeBmp)*sizeof(edgeBmp[0]), 0);
- end;
-
- procedure drawPanel (pan: TPanel);
- var
- sx, len, y0, y1: Integer;
- begin
- if (pan = nil) or (pan.Width < 1) or (pan.Height < 1) then exit;
- if (pan.X+pan.Width <= vpx-1) or (pan.Y+pan.Height <= vpy-1) then exit;
- if (pan.X >= vpx+vpw+1) or (pan.Y >= vpy+vph+1) then exit;
- if g_ol_nice or g_ol_fill_walls then
- begin
- sx := pan.X-(vpx-1);
- len := pan.Width;
- if (len > gWinSizeX+4) then len := gWinSizeX+4;
- if (sx < 0) then begin len += sx; sx := 0; end;
- if (sx+len > gWinSizeX+4) then len := gWinSizeX+4-sx;
- if (len < 1) then exit;
- assert(sx >= 0);
- assert(sx+len <= gWinSizeX+4);
- y0 := pan.Y-(vpy-1);
- y1 := y0+pan.Height;
- if (y0 < 0) then y0 := 0;
- if (y1 > gWinSizeY+4) then y1 := gWinSizeY+4;
- while (y0 < y1) do
- begin
- FillChar(edgeBmp[y0*(gWinSizeX+4)+sx], len*sizeof(edgeBmp[0]), 1);
- Inc(y0);
- end;
- end
- else
- begin
- drawRect(pan.X, pan.Y, pan.Width, pan.Height, r, g, b);
- end;
- end;
-
-var
- lsx: Integer = -1;
- lex: Integer = -1;
- lsy: Integer = -1;
-
- procedure flushLine ();
- begin
- if (lsy > 0) and (lsx > 0) then
- begin
- if (lex = lsx) then
- begin
- glBegin(GL_POINTS);
- glVertex2f(lsx-1+vpx+0.37, lsy-1+vpy+0.37);
- glEnd();
- end
- else
- begin
- glBegin(GL_LINES);
- glVertex2f(lsx-1+vpx+0.37, lsy-1+vpy+0.37);
- glVertex2f(lex-0+vpx+0.37, lsy-1+vpy+0.37);
- glEnd();
- end;
- end;
- lsx := -1;
- lex := -1;
- end;
-
- procedure startLine (y: Integer);
- begin
- flushLine();
- lsy := y;
- end;
-
- procedure putPixel (x: Integer);
- begin
- if (x < 1) then exit;
- if (lex+1 <> x) then flushLine();
- if (lsx < 0) then lsx := x;
- lex := x;
- end;
-
- procedure drawEdges ();
- var
- x, y: Integer;
- a: PByte;
- begin
- glDisable(GL_BLEND);
- glDisable(GL_TEXTURE_2D);
- glLineWidth(1);
- glPointSize(1);
- glDisable(GL_LINE_SMOOTH);
- glDisable(GL_POLYGON_SMOOTH);
- glColor4f(r/255.0, g/255.0, b/255.0, 1.0);
- for y := 1 to vph do
- begin
- a := @edgeBmp[y*(gWinSizeX+4)+1];
- startLine(y);
- for x := 1 to vpw do
- begin
- if (a[0] <> 0) then
- begin
- if (a[-1] = 0) or (a[1] = 0) or (a[-(gWinSizeX+4)] = 0) or (a[gWinSizeX+4] = 0) or
- (a[-(gWinSizeX+4)-1] = 0) or (a[-(gWinSizeX+4)+1] = 0) or
- (a[gWinSizeX+4-1] = 0) or (a[gWinSizeX+4+1] = 0) then
- begin
- putPixel(x);
- end;
- end;
- Inc(a);
- end;
- flushLine();
- end;
- end;
-
- procedure drawFilledWalls ();
- var
- x, y: Integer;
- a: PByte;
- begin
- glDisable(GL_BLEND);
- glDisable(GL_TEXTURE_2D);
- glLineWidth(1);
- glPointSize(1);
- glDisable(GL_LINE_SMOOTH);
- glDisable(GL_POLYGON_SMOOTH);
- glColor4f(r/255.0, g/255.0, b/255.0, 1.0);
- for y := 1 to vph do
- begin
- a := @edgeBmp[y*(gWinSizeX+4)+1];
- startLine(y);
- for x := 1 to vpw do
- begin
- if (a[0] <> 0) then putPixel(x);
- Inc(a);
- end;
- flushLine();
- end;
- end;
-
- procedure doWallsOld (parr: array of TPanel; ptype: Word; ar, ag, ab: Integer);
- var
- f: Integer;
- pan: TPanel;
- begin
- r := ar;
- g := ag;
- b := ab;
- if g_ol_nice or g_ol_fill_walls then clearEdgeBmp();
- for f := 0 to High(parr) do
- begin
- pan := parr[f];
- if (pan = nil) or not pan.Enabled or (pan.Width < 1) or (pan.Height < 1) then continue;
- if ((pan.PanelType and ptype) = 0) then continue;
- drawPanel(pan);
- end;
- if g_ol_nice then drawEdges();
- if g_ol_fill_walls then drawFilledWalls();
- end;
-
-var
- xptag: Word;
-
- function doWallCB (pan: TPanel; tag: Integer): Boolean;
- begin
- result := false; // don't stop
- //if (pan = nil) or not pan.Enabled or (pan.Width < 1) or (pan.Height < 1) then exit;
- if ((pan.PanelType and xptag) = 0) then exit;
- drawPanel(pan);
- end;
-
- procedure doWalls (parr: array of TPanel; ptype: Word; ar, ag, ab: Integer);
- begin
- r := ar;
- g := ag;
- b := ab;
- xptag := ptype;
- if ((ptype and (PANEL_WALL or PANEL_OPENDOOR or PANEL_CLOSEDOOR)) <> 0) then ptype := GridTagWall or GridTagDoor
- else panelTypeToTag(ptype);
- if g_ol_nice or g_ol_fill_walls then clearEdgeBmp();
- mapGrid.forEachInAABB(vpx-1, vpy-1, vpw+2, vph+2, doWallCB, ptype);
- if g_ol_nice then drawEdges();
- if g_ol_fill_walls then drawFilledWalls();
- end;
-
+procedure toggleOutlineWindow (arg: Integer=-1);
begin
- if g_ol_rlayer_back then doWallsOld(gRenderBackgrounds, PANEL_BACK, 255, 127, 0);
- if g_ol_rlayer_step then doWallsOld(gSteps, PANEL_STEP, 192, 192, 192);
- if g_ol_rlayer_wall then doWallsOld(gWalls, PANEL_WALL, 255, 255, 255);
- if g_ol_rlayer_door then doWallsOld(gWalls, PANEL_OPENDOOR or PANEL_CLOSEDOOR, 0, 255, 0);
- if g_ol_rlayer_acid1 then doWallsOld(gAcid1, PANEL_ACID1, 255, 0, 0);
- if g_ol_rlayer_acid2 then doWallsOld(gAcid2, PANEL_ACID2, 198, 198, 0);
- if g_ol_rlayer_water then doWallsOld(gWater, PANEL_WATER, 0, 255, 255);
- if g_ol_rlayer_fore then doWallsOld(gRenderForegrounds, PANEL_FORE, 210, 210, 210);
+ if (arg < 0) then showOutlineWindow := not showOutlineWindow else showOutlineWindow := (arg > 0);
+ showOutlineWindow := not showOutlineWindow; // hack for callback
+ toggleOutlineWindowCB(nil);
end;
-
-procedure plrDebugDraw ();
- procedure drawTileGrid ();
- var
- x, y: Integer;
- begin
- for y := 0 to (mapGrid.gridHeight div mapGrid.tileSize) do
- begin
- drawLine(mapGrid.gridX0, mapGrid.gridY0+y*mapGrid.tileSize, mapGrid.gridX0+mapGrid.gridWidth, mapGrid.gridY0+y*mapGrid.tileSize, 96, 96, 96, 255);
- end;
-
- for x := 0 to (mapGrid.gridWidth div mapGrid.tileSize) do
- begin
- drawLine(mapGrid.gridX0+x*mapGrid.tileSize, mapGrid.gridY0, mapGrid.gridX0+x*mapGrid.tileSize, mapGrid.gridY0+y*mapGrid.gridHeight, 96, 96, 96, 255);
- end;
- end;
-
- procedure hilightCell (cx, cy: Integer);
- begin
- fillRect(cx, cy, monsGrid.tileSize, monsGrid.tileSize, 0, 128, 0, 64);
- end;
-
- procedure hilightCell1 (cx, cy: Integer);
- begin
- //e_WriteLog(Format('h1: (%d,%d)', [cx, cy]), MSG_NOTIFY);
- fillRect(cx, cy, monsGrid.tileSize, monsGrid.tileSize, 255, 255, 0, 92);
- end;
-
- function hilightWallTrc (pan: TPanel; tag: Integer; x, y, prevx, prevy: Integer): Boolean;
- begin
- result := false; // don't stop
- if (pan = nil) then exit; // cell completion, ignore
- //e_WriteLog(Format('h1: (%d,%d)', [cx, cy]), MSG_NOTIFY);
- fillRect(pan.X, pan.Y, pan.Width, pan.Height, 0, 128, 128, 64);
- end;
-
- function monsCollector (mon: TMonster; tag: Integer): Boolean;
- var
- ex, ey: Integer;
- mx, my, mw, mh: Integer;
- begin
- result := false;
- mon.getMapBox(mx, my, mw, mh);
- e_DrawQuad(mx, my, mx+mw-1, my+mh-1, 255, 255, 0, 96);
- if lineAABBIntersects(laserX0, laserY0, laserX1, laserY1, mx, my, mw, mh, ex, ey) then
- begin
- e_DrawPoint(8, ex, ey, 0, 255, 0);
- end;
- end;
-
- procedure drawMonsterInfo (mon: TMonster);
- var
- mx, my, mw, mh: Integer;
-
- procedure drawMonsterTargetLine ();
- var
- emx, emy, emw, emh: Integer;
- enemy: TMonster;
- eplr: TPlayer;
- ex, ey: Integer;
- begin
- if (g_GetUIDType(mon.MonsterTargetUID) = UID_PLAYER) then
- begin
- eplr := g_Player_Get(mon.MonsterTargetUID);
- if (eplr <> nil) then eplr.getMapBox(emx, emy, emw, emh) else exit;
- end
- else if (g_GetUIDType(mon.MonsterTargetUID) = UID_MONSTER) then
- begin
- enemy := g_Monsters_ByUID(mon.MonsterTargetUID);
- if (enemy <> nil) then enemy.getMapBox(emx, emy, emw, emh) else exit;
- end
- else
- begin
- exit;
- end;
- mon.getMapBox(mx, my, mw, mh);
- drawLine(mx+mw div 2, my+mh div 2, emx+emw div 2, emy+emh div 2, 255, 0, 0, 255);
- if (g_Map_traceToNearestWall(mx+mw div 2, my+mh div 2, emx+emw div 2, emy+emh div 2, @ex, @ey) <> nil) then
- begin
- drawLine(mx+mw div 2, my+mh div 2, ex, ey, 0, 255, 0, 255);
- end;
- end;
-
- procedure drawLOS2Plr ();
- var
- emx, emy, emw, emh: Integer;
- eplr: TPlayer;
- ex, ey: Integer;
- begin
- eplr := gPlayers[0];
- if (eplr = nil) then exit;
- eplr.getMapBox(emx, emy, emw, emh);
- mon.getMapBox(mx, my, mw, mh);
- drawLine(mx+mw div 2, my+mh div 2, emx+emw div 2, emy+emh div 2, 255, 0, 0, 255);
- {$IF DEFINED(D2F_DEBUG)}
- //mapGrid.dbgRayTraceTileHitCB := hilightCell1;
- {$ENDIF}
- if (g_Map_traceToNearestWall(mx+mw div 2, my+mh div 2, emx+emw div 2, emy+emh div 2, @ex, @ey) <> nil) then
- //if (mapGrid.traceRay(ex, ey, mx+mw div 2, my+mh div 2, emx+emw div 2, emy+emh div 2, hilightWallTrc, (GridTagWall or GridTagDoor)) <> nil) then
- begin
- drawLine(mx+mw div 2, my+mh div 2, ex, ey, 0, 255, 0, 255);
- end;
- {$IF DEFINED(D2F_DEBUG)}
- //mapGrid.dbgRayTraceTileHitCB := nil;
- {$ENDIF}
- end;
-
- begin
- if (mon = nil) then exit;
- mon.getMapBox(mx, my, mw, mh);
- //mx += mw div 2;
-
- monsGrid.forEachBodyCell(mon.proxyId, hilightCell);
-
- if showMonsInfo then
- begin
- //fillRect(mx-4, my-7*8-6, 110, 7*8+6, 0, 0, 94, 250);
- darkenRect(mx-4, my-7*8-6, 110, 7*8+6, 128);
- my -= 8;
- my -= 2;
-
- // type
- drawText6(mx, my, Format('%s(U:%u)', [monsTypeToString(mon.MonsterType), mon.UID]), 255, 127, 0); my -= 8;
- // beh
- drawText6(mx, my, Format('Beh: %s', [monsBehToString(mon.MonsterBehaviour)]), 255, 127, 0); my -= 8;
- // state
- drawText6(mx, my, Format('State:%s (%d)', [monsStateToString(mon.MonsterState), mon.MonsterSleep]), 255, 127, 0); my -= 8;
- // health
- drawText6(mx, my, Format('Health:%d', [mon.MonsterHealth]), 255, 127, 0); my -= 8;
- // ammo
- drawText6(mx, my, Format('Ammo:%d', [mon.MonsterAmmo]), 255, 127, 0); my -= 8;
- // target
- drawText6(mx, my, Format('TgtUID:%u', [mon.MonsterTargetUID]), 255, 127, 0); my -= 8;
- drawText6(mx, my, Format('TgtTime:%d', [mon.MonsterTargetTime]), 255, 127, 0); my -= 8;
- end;
-
- drawMonsterTargetLine();
- if showMonsLOS2Plr then drawLOS2Plr();
- {
- property MonsterRemoved: Boolean read FRemoved write FRemoved;
- property MonsterPain: Integer read FPain write FPain;
- property MonsterAnim: Byte read FCurAnim write FCurAnim;
- }
- end;
-
- function highlightAllMonsterCells (mon: TMonster): Boolean;
- begin
- result := false; // don't stop
- monsGrid.forEachBodyCell(mon.proxyId, hilightCell);
- end;
-
- procedure drawTrigger (var trig: TTrigger);
-
- procedure drawPanelDest (pguid: Integer);
- var
- pan: TPanel;
- begin
- pan := g_Map_PanelByGUID(pguid);
- if (pan = nil) then exit;
- drawLine(
- trig.trigCenter.x, trig.trigCenter.y,
- pan.x+pan.width div 2, pan.y+pan.height div 2,
- 255, 0, 255, 220);
- end;
-
- var
- tts: AnsiString;
- tx: Integer;
- begin
- fillRect(trig.x, trig.y, trig.width, trig.height, 255, 0, 255, 96);
- tts := trigType2Str(trig.TriggerType);
- tx := trig.x+(trig.width-Length(tts)*6) div 2;
- darkenRect(tx-2, trig.y-10, Length(tts)*6+4, 10, 64);
- drawText6(tx, trig.y-9, tts, 255, 127, 0);
- tx := trig.x+(trig.width-Length(trig.mapId)*6) div 2;
- darkenRect(tx-2, trig.y-20, Length(trig.mapId)*6+4, 10, 64);
- drawText6(tx, trig.y-19, trig.mapId, 255, 255, 0);
- drawPanelDest(trig.trigPanelGUID);
- case trig.TriggerType of
- TRIGGER_NONE: begin end;
- TRIGGER_EXIT: begin end;
- TRIGGER_TELEPORT: begin end;
- TRIGGER_OPENDOOR: begin end;
- TRIGGER_CLOSEDOOR: begin end;
- TRIGGER_DOOR: begin end;
- TRIGGER_DOOR5: begin end;
- TRIGGER_CLOSETRAP: begin end;
- TRIGGER_TRAP: begin end;
- TRIGGER_SECRET: begin end;
- TRIGGER_LIFTUP: begin end;
- TRIGGER_LIFTDOWN: begin end;
- TRIGGER_LIFT: begin end;
- TRIGGER_TEXTURE: begin end;
- TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF, TRIGGER_PRESS:
- begin
- if (trig.trigData.trigTWidth > 0) and (trig.trigData.trigTHeight > 0) then
- begin
- fillRect(
- trig.trigData.trigTX, trig.trigData.trigTY,
- trig.trigData.trigTWidth, trig.trigData.trigTHeight,
- 0, 255, 255, 42);
- drawLine(
- trig.trigCenter.x, trig.trigCenter.y,
- trig.trigData.trigTX+trig.trigData.trigTWidth div 2,
- trig.trigData.trigTY+trig.trigData.trigTHeight div 2,
- 255, 0, 255, 220);
- end;
- end;
- TRIGGER_SOUND: begin end;
- TRIGGER_SPAWNMONSTER: begin end;
- TRIGGER_SPAWNITEM: begin end;
- TRIGGER_MUSIC: begin end;
- TRIGGER_PUSH: begin end;
- TRIGGER_SCORE: begin end;
- TRIGGER_MESSAGE: begin end;
- TRIGGER_DAMAGE: begin end;
- TRIGGER_HEALTH: begin end;
- TRIGGER_SHOT: begin end;
- TRIGGER_EFFECT: begin end;
- TRIGGER_SCRIPT: begin end;
- end;
- //trigType2Str
- //trigPanelId: Integer;
- end;
-
- procedure drawTriggers ();
- var
- f: Integer;
- begin
- for f := 0 to High(gTriggers) do drawTrigger(gTriggers[f]);
- end;
-
-var
- mon: TMonster;
- mx, my, mw, mh: Integer;
+procedure toggleHelpWindow (arg: Integer=-1);
begin
- if (gPlayer1 = nil) then exit;
-
- glEnable(GL_SCISSOR_TEST);
- glScissor(0, gWinSizeY-gPlayerScreenSize.Y-1, vpw, vph);
-
- glPushMatrix();
- glScalef(g_dbg_scale, g_dbg_scale, 1.0);
- glTranslatef(-vpx, -vpy, 0);
-
- if (showGrid) then drawTileGrid();
- drawOutlines();
-
- if (laserSet) then g_Mons_AlongLine(laserX0, laserY0, laserX1, laserY1, monsCollector, true);
-
- if (monMarkedUID <> -1) then
+ if (winHelp = nil) then
begin
- mon := g_Monsters_ByUID(monMarkedUID);
- if (mon <> nil) then
- begin
- mon.getMapBox(mx, my, mw, mh);
- e_DrawQuad(mx, my, mx+mw-1, my+mh-1, 255, 0, 0, 30);
- drawMonsterInfo(mon);
- end;
+ if (arg = 0) then exit;
+ createHelpWindow();
end;
-
- if showAllMonsCells then g_Mons_ForEach(highlightAllMonsterCells);
- if showTriggers then drawTriggers();
-
- glPopMatrix();
-
- glDisable(GL_SCISSOR_TEST);
-
- if showMapCurPos then drawText8(4, gWinSizeY-10, Format('mappos:(%d,%d)', [pmsCurMapX, pmsCurMapY]), 255, 255, 0);
+ if (arg < 0) then begin if not uiVisibleWindow(winHelp) then uiAddWindow(winHelp) else uiRemoveWindow(winHelp); end
+ else if (arg = 0) then begin if uiVisibleWindow(winHelp) then uiRemoveWindow(winHelp); end
+ else begin if (not uiVisibleWindow(winHelp)) then uiAddWindow(winHelp); end;
+ if (not uiVisibleWindow(winHelp)) then FreeAndNil(winHelp);
end;
-
-// ////////////////////////////////////////////////////////////////////////// //
-function g_Holmes_MouseEvent (var ev: THMouseEvent): Boolean;
+procedure toggleOptionsWindow (arg: Integer=-1);
begin
- holmesInitCommands();
- holmesInitBinds();
- result := true;
- msX := ev.x;
- msY := ev.y;
- msB := ev.bstate;
- kbS := ev.kstate;
- msB := msB;
- if not uiMouseEvent(ev) then plrDebugMouse(ev);
+ if (winOptions = nil) then createOptionsWindow();
+ if (arg < 0) then begin if not uiVisibleWindow(winOptions) then uiAddWindow(winOptions) else uiRemoveWindow(winOptions); end
+ else if (arg = 0) then begin if uiVisibleWindow(winOptions) then uiRemoveWindow(winOptions); end
+ else begin if not uiVisibleWindow(winOptions) then uiAddWindow(winOptions); end
end;
// ////////////////////////////////////////////////////////////////////////// //
-function g_Holmes_KeyEvent (var ev: THKeyEvent): Boolean;
+{$IFDEF USE_SDL2}
+procedure onKeyEvent (var ev: TFUIEvent);
{$IF DEFINED(D2F_DEBUG)}
var
pan: TPanel;
end;
begin
- holmesInitCommands();
- holmesInitBinds();
- result := false;
- msB := ev.bstate;
- kbS := ev.kstate;
- case ev.scan of
- SDL_SCANCODE_LCTRL, SDL_SCANCODE_RCTRL,
- SDL_SCANCODE_LALT, SDL_SCANCODE_RALT,
- SDL_SCANCODE_LSHIFT, SDL_SCANCODE_RSHIFT:
- result := true;
- end;
- if uiKeyEvent(ev) then begin result := true; exit; end;
- if keybindExecute(ev) then begin result := true; exit; end;
// press
- if (ev.kind = THKeyEvent.Press) then
+ if (ev.press) then
begin
{$IF DEFINED(D2F_DEBUG)}
// C-UP, C-DOWN, C-LEFT, C-RIGHT: trace 10 pixels from cursor in the respective direction
if ((ev.scan = SDL_SCANCODE_UP) or (ev.scan = SDL_SCANCODE_DOWN) or (ev.scan = SDL_SCANCODE_LEFT) or (ev.scan = SDL_SCANCODE_RIGHT)) and
- ((ev.kstate and THKeyEvent.ModCtrl) <> 0) then
+ ((ev.kstate and TFUIEvent.ModCtrl) <> 0) then
begin
- result := true;
+ ev.eat();
dx := pmsCurMapX;
dy := pmsCurMapY;
case ev.scan of
{$ENDIF}
end;
end;
+{$ELSE}
+procedure onKeyEvent (var ev: TFUIEvent);
+begin
+end;
+{$ENDIF}
// ////////////////////////////////////////////////////////////////////////// //
-procedure g_Holmes_Draw ();
+procedure g_Holmes_OnEvent (var ev: TFUIEvent);
+ var doeat: Boolean = false;
begin
- {$IF not DEFINED(HEADLESS)}
+ if g_Game_IsNet then exit;
+ if not g_holmes_enabled then exit;
+ if g_holmes_imfunctional then exit;
+
holmesInitCommands();
holmesInitBinds();
- glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); // modify color buffer
- glDisable(GL_STENCIL_TEST);
- glDisable(GL_BLEND);
- glDisable(GL_SCISSOR_TEST);
- glDisable(GL_TEXTURE_2D);
+ msB := ev.bstate;
+ kbS := ev.kstate;
- if gGameOn then
+ if (ev.key) then
+ begin
+{$IFDEF USE_SDL2}
+ case ev.scan of
+ SDL_SCANCODE_LCTRL, SDL_SCANCODE_RCTRL,
+ SDL_SCANCODE_LALT, SDL_SCANCODE_RALT,
+ SDL_SCANCODE_LSHIFT, SDL_SCANCODE_RSHIFT:
+ doeat := true;
+ end;
+{$ENDIF}
+ end
+ else if (ev.mouse) then
begin
- plrDebugDraw();
+ msX := ev.x;
+ msY := ev.y;
+ msB := ev.bstate;
+ kbS := ev.kstate;
+ msB := msB;
end;
- {$ENDIF}
- laserSet := false;
-end;
+ uiDispatchEvent(ev);
+ if (not ev.alive) then exit;
+ if (ev.mouse) then
+ begin
+ if (gPlayer1 <> nil) and r_Render_HolmesViewIsSet() then msbindExecute(ev);
+ ev.eat();
+ end
+ else
+ begin
+ if keybindExecute(ev) then ev.eat();
+ if (ev.alive) then onKeyEvent(ev);
+ end;
-procedure g_Holmes_DrawUI ();
-begin
- {$IF not DEFINED(HEADLESS)}
- uiDraw();
- drawCursor();
- {$ENDIF}
+ if (doeat) then ev.eat();
end;
// ////////////////////////////////////////////////////////////////////////// //
procedure bcOneMonsterThinkStep (); begin gmon_debug_think := false; gmon_debug_one_think_step := true; end;
+procedure bcOneMPlatThinkStep (); begin g_dbgpan_mplat_active := false; g_dbgpan_mplat_step := true; end;
+procedure bcMPlatToggle (); begin g_dbgpan_mplat_active := not g_dbgpan_mplat_active; end;
+
procedure bcToggleMonsterInfo (arg: Integer=-1); begin if (arg < 0) then showMonsInfo := not showMonsInfo else showMonsInfo := (arg > 0); end;
procedure bcToggleMonsterLOSPlr (arg: Integer=-1); begin if (arg < 0) then showMonsLOS2Plr := not showMonsLOS2Plr else showMonsLOS2Plr := (arg > 0); end;
procedure bcToggleMonsterCells (arg: Integer=-1); begin if (arg < 0) then showAllMonsCells := not showAllMonsCells else showAllMonsCells := (arg > 0); end;
@@ -1278,6 +643,20 @@ procedure bcToggleDrawTriggers (arg: Integer=-1); begin if (arg < 0) then showTr
procedure bcToggleCurPos (arg: Integer=-1); begin if (arg < 0) then showMapCurPos := not showMapCurPos else showMapCurPos := (arg > 0); end;
procedure bcToggleGrid (arg: Integer=-1); begin if (arg < 0) then showGrid := not showGrid else showGrid := (arg > 0); end;
+procedure bcMonsterSpawn (s: AnsiString);
+var
+ mon: TMonster;
+begin
+ if not gGameOn or g_Game_IsClient then
+ begin
+ conwriteln('cannot spawn monster in this mode');
+ exit;
+ end;
+ mon := g_Mons_SpawnAt(s, pmsCurMapX, pmsCurMapY);
+ if (mon = nil) then begin conwritefln('unknown monster id: ''%s''', [s]); exit; end;
+ monMarkedUID := mon.UID;
+end;
+
procedure bcMonsterWakeup ();
var
mon: TMonster;
end;
end;
+procedure dbgToggleTraceBox (arg: Integer=-1); begin if (arg < 0) then showTraceBox := not showTraceBox else showTraceBox := (arg > 0); end;
+
+procedure dbgToggleHolmesPause (arg: Integer=-1); begin if (arg < 0) then g_Game_HolmesPause(not gPauseHolmes) else g_Game_HolmesPause(arg > 0); end;
+
procedure cbAtcurSelectMonster ();
- function monsAtDump (mon: TMonster; tag: Integer): Boolean;
+ function monsAtDump (mon: TMonster{; tag: Integer}): Boolean;
begin
result := true; // stop
- e_WriteLog(Format('monster #%d (UID:%u) (proxyid:%d)', [mon.arrIdx, mon.UID, mon.proxyId]), MSG_NOTIFY);
+ e_WriteLog(Format('monster #%d (UID:%u) (proxyid:%d)', [mon.arrIdx, mon.UID, mon.proxyId]), TMsgType.Notify);
monMarkedUID := mon.UID;
dumpPublishedProperties(mon);
end;
var
plr: TPlayer;
x, y, w, h: Integer;
+ mit: PMonster;
+ it: TMonsterGrid.Iter;
begin
monMarkedUID := -1;
if (Length(gPlayers) > 0) then
end;
end;
//e_WriteLog('===========================', MSG_NOTIFY);
- monsGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, monsAtDump);
+ it := monsGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY);
+ for mit in it do monsAtDump(mit^);
+ it.release();
//e_WriteLog('---------------------------', MSG_NOTIFY);
end;
procedure cbAtcurDumpMonsters ();
- function monsAtDump (mon: TMonster; tag: Integer): Boolean;
+ function monsAtDump (mon: TMonster{; tag: Integer}): Boolean;
begin
result := false; // don't stop
- e_WriteLog(Format('monster #%d (UID:%u) (proxyid:%d)', [mon.arrIdx, mon.UID, mon.proxyId]), MSG_NOTIFY);
+ e_WriteLog(Format('monster #%d (UID:%u) (proxyid:%d)', [mon.arrIdx, mon.UID, mon.proxyId]), TMsgType.Notify);
end;
+var
+ mit: PMonster;
+ it: TMonsterGrid.Iter;
begin
- e_WriteLog('===========================', MSG_NOTIFY);
- monsGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, monsAtDump);
- e_WriteLog('---------------------------', MSG_NOTIFY);
+ it := monsGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY);
+ if (it.length > 0) then
+ begin
+ e_WriteLog('===========================', TMsgType.Notify);
+ for mit in it do monsAtDump(mit^);
+ e_WriteLog('---------------------------', TMsgType.Notify);
+ end;
+ it.release();
end;
procedure cbAtcurDumpWalls ();
- function wallToggle (pan: TPanel; tag: Integer): Boolean;
+ function wallToggle (pan: TPanel{; tag: Integer}): Boolean;
begin
result := false; // don't stop
- e_LogWritefln('wall #%d(%d); enabled=%d (%d); (%d,%d)-(%d,%d)', [pan.arrIdx, pan.proxyId, Integer(pan.Enabled), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.X, pan.Y, pan.Width, pan.Height]);
+ if (platMarkedGUID = -1) then platMarkedGUID := pan.guid;
+ e_LogWritefln('wall ''%s'' #%d(%d); enabled=%d (%d); (%d,%d)-(%d,%d)', [pan.mapId, pan.arrIdx, pan.proxyId, Integer(pan.Enabled), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.X, pan.Y, pan.Width, pan.Height]);
dumpPublishedProperties(pan);
end;
var
hasTrigs: Boolean = false;
f: Integer;
trig: PTrigger;
+ mwit: PPanel;
+ it: TPanelGrid.Iter;
begin
- e_WriteLog('=== TOGGLE WALL ===', MSG_NOTIFY);
- mapGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, wallToggle, (GridTagWall or GridTagDoor));
- e_WriteLog('--- toggle wall ---', MSG_NOTIFY);
+ platMarkedGUID := -1;
+ it := mapGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, (GridTagWall or GridTagDoor));
+ if (it.length > 0) then
+ begin
+ e_WriteLog('=== TOGGLE WALL ===', TMsgType.Notify);
+ for mwit in it do wallToggle(mwit^);
+ e_WriteLog('--- toggle wall ---', TMsgType.Notify);
+ end;
+ it.release();
if showTriggers then
begin
for f := 0 to High(gTriggers) do
end;
procedure cbAtcurToggleWalls ();
- function wallToggle (pan: TPanel; tag: Integer): Boolean;
+ function wallToggle (pan: TPanel{; tag: Integer}): Boolean;
begin
result := false; // don't stop
//e_WriteLog(Format('wall #%d(%d); enabled=%d (%d); (%d,%d)-(%d,%d)', [pan.arrIdx, pan.proxyId, Integer(pan.Enabled), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.X, pan.Y, pan.Width, pan.Height]), MSG_NOTIFY);
if pan.Enabled then g_Map_DisableWallGUID(pan.guid) else g_Map_EnableWallGUID(pan.guid);
end;
+var
+ mwit: PPanel;
+ it: TPanelGrid.Iter;
begin
//e_WriteLog('=== TOGGLE WALL ===', MSG_NOTIFY);
- mapGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, wallToggle, (GridTagWall or GridTagDoor));
//e_WriteLog('--- toggle wall ---', MSG_NOTIFY);
+ it := mapGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, (GridTagWall or GridTagDoor));
+ for mwit in it do wallToggle(mwit^);
+ it.release();
end;
cmdAdd('mon_info', bcToggleMonsterInfo, 'toggle monster info', 'monster control');
cmdAdd('mon_los_plr', bcToggleMonsterLOSPlr, 'toggle monster LOS to player', 'monster control');
cmdAdd('mon_cells', bcToggleMonsterCells, 'toggle "show all cells occupied by monsters" (SLOW!)', 'monster control');
- cmdAdd('mon_wakeup', bcMonsterWakeup, 'toggle "show all cells occupied by monsters" (SLOW!)', 'monster control');
+ cmdAdd('mon_wakeup', bcMonsterWakeup, 'wake up selected monster', 'monster control');
+
+ cmdAdd('mon_spawn', bcMonsterSpawn, 'spawn monster', 'monster control');
+
+ cmdAdd('mplat_step', bcOneMPlatThinkStep, 'one mplat think step', 'mplat control');
+ cmdAdd('mplat_toggle', bcMPlatToggle, 'activate/deactivate moving platforms', 'mplat control');
cmdAdd('plr_teleport', bcPlayerTeleport, 'teleport player', 'player control');
cmdAdd('atcur_dump_monsters', cbAtcurDumpMonsters, 'dump monsters in cell', 'monster control');
cmdAdd('atcur_dump_walls', cbAtcurDumpWalls, 'dump walls in cell', 'wall control');
cmdAdd('atcur_disable_walls', cbAtcurToggleWalls, 'disable walls', 'wall control');
+
+ cmdAdd('dbg_tracebox', dbgToggleTraceBox, 'test traceBox()', 'player control');
+
+ cmdAdd('hlm_pause', dbgToggleHolmesPause, '"Holmes" pause mode', 'game control');
end;
keybindAdd('M-G', 'mon_cells');
keybindAdd('M-A', 'mon_wakeup');
+ keybindAdd('M-P', 'mplat_step');
+ keybindAdd('M-O', 'mplat_toggle');
+
keybindAdd('C-T', 'plr_teleport');
+ keybindAdd('M-T', 'dbg_tracebox');
keybindAdd('C-P', 'dbg_curpos');
keybindAdd('C-G', 'dbg_grid');
keybindAdd('C-X', 'dbg_triggers');
+ keybindAdd('C-1', 'mon_spawn zombie');
+
+ keybindAdd('C-S-P', 'hlm_pause');
+
// mouse
msbindAdd('LMB', 'atcur_select_monster');
msbindAdd('M-LMB', 'atcur_dump_monsters');
// load bindings from file
try
- st := openDiskFileRO(GameDir+'holmes.rc');
+ st := e_OpenResourceRO(ConfigDirs, 'holmes.rc');
pr := TFileTextParser.Create(st);
conwriteln('parsing "holmes.rc"...');
while (pr.tokType <> pr.TTEOF) do
end;
+begin
+ // shut up, fpc!
+ msB := msB;
+
+ fuiEventCB := g_Holmes_OnEvent;
+ //uiContext.font := 'win14';
end.