diff --git a/src/game/g_holmes.pas b/src/game/g_holmes.pas
index 8bbb880328132e98a426af6d69bfc7ac21c862dc..1222cd6c73da25c92ce45a6b16c643137e5bdea8 100644 (file)
--- a/src/game/g_holmes.pas
+++ b/src/game/g_holmes.pas
interface
uses
- e_log,
+ 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;
sym: Word; // SDLK_XXX
bstate: Word; // button state
kstate: Word; // keyboard state
- end;
+ public
+ end;
procedure g_Holmes_VidModeChanged ();
procedure g_Holmes_WindowFocused ();
procedure g_Holmes_WindowBlured ();
procedure g_Holmes_Draw ();
+procedure g_Holmes_DrawUI ();
-function g_Holmes_mouseEvent (var ev: THMouseEvent): Boolean; // returns `true` if event was eaten
+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_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_enabled: Boolean = {$IF DEFINED(D2F_DEBUG)}true{$ELSE}false{$ENDIF};
showMonsLOS2Plr: Boolean = false;
showAllMonsCells: Boolean = false;
showMapCurPos: Boolean = false;
-
+ showLayersWindow: Boolean = false;
+ showOutlineWindow: Boolean = false;
// ////////////////////////////////////////////////////////////////////////// //
{$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);
+ 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;
+ 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;
+ 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) and (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;
+
+
+// ////////////////////////////////////////////////////////////////////////// //
+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
+ winHelp: THTopWindow = nil;
+ winOptions: THTopWindow = nil;
+ winLayers: THTopWindow = nil;
+ winOutlines: THTopWindow = nil;
+
+
+procedure createHelpWindow ();
+var
+ llb: THCtlSimpleText;
+begin
+ llb := THCtlSimpleText.Create(0, 0);
+ llb.appendItem('common keys', true, true);
+ llb.appendItem(' F1 -- toggle this window');
+ llb.appendItem(' M-F1 -- toggle options window');
+ llb.appendItem('');
+ llb.appendItem('control keys', true, true);
+ llb.appendItem(' M-M -- one monster think step');
+ llb.appendItem(' M-I -- toggle monster info');
+ llb.appendItem(' M-K -- toggle monster LOS to player');
+ llb.appendItem(' M-G -- toggle "show all cells occupied by monsters" (SLOW!)');
+ llb.appendItem(' M-A -- wake up monster');
+ llb.appendItem(' C-T -- teleport player');
+ llb.appendItem(' C-P -- show cursor position on the map');
+ llb.appendItem(' C-G -- toggle grid');
+ llb.appendItem(' C-L -- toggle layers window');
+ llb.appendItem(' C-O -- toggle outlines window');
+ llb.appendItem('');
+ llb.appendItem('mouse', true, true);
+ llb.appendItem(' LMB -- select monster');
+ llb.appendItem(' M-LMB -- dump monsters in cell (to log)');
+ llb.appendItem(' RMB -- dump wall info to log');
+ llb.appendItem(' M-LMB -- disable wall');
+ winHelp := THTopWindow.Create('Holmes Help', 10, 10);
+ 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 createLayersWindow ();
+var
+ llb: THCtlCBListBox;
+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('visible', 10, 10);
+ winLayers.escClose := true;
+ winLayers.appendChild(llb);
+ winLayers.closeCB := winLayersClosed;
+end;
+
+
+procedure createOutlinesWindow ();
+var
+ llb: THCtlCBListBox;
+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;
+end;
+
+
+procedure toggleLayersWindow (me: THControl; checked: Integer);
+begin
+ if showLayersWindow then
+ begin
+ if (winLayers = nil) then createLayersWindow();
+ uiAddWindow(winLayers);
+ end
+ else
+ begin
+ uiRemoveWindow(winLayers);
+ end;
+end;
+
+
+procedure toggleOutlineWindow (me: THControl; checked: Integer);
+begin
+ if showOutlineWindow then
+ begin
+ if (winOutlines = nil) then createOutlinesWindow();
+ uiAddWindow(winOutlines);
+ end
+ else
+ begin
+ uiRemoveWindow(winOutlines);
+ end;
+end;
+
+
+procedure createOptionsWindow ();
+var
+ llb: THCtlCBListBox;
+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('WINDOWS', nil);
+ llb.appendItem('layers window', @showLayersWindow, toggleLayersWindow);
+ llb.appendItem('outline window', @showOutlineWindow, toggleOutlineWindow);
+ winOptions := THTopWindow.Create('Holmes Options', 100, 100);
+ winOptions.escClose := true;
+ winOptions.appendChild(llb);
+ winOptions.centerInScreen();
+end;
// ////////////////////////////////////////////////////////////////////////// //
procedure g_Holmes_VidModeChanged ();
begin
- e_WriteLog(Format('Inspector: videomode changed: %dx%d', [gScreenWidth, gScreenHeight]), MSG_NOTIFY);
+ e_WriteLog(Format('Holmes: videomode changed: %dx%d', [gScreenWidth, gScreenHeight]), MSG_NOTIFY);
// texture space is possibly lost here, idc
curtexid := 0;
font6texid := 0;
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 ((kbS and THKeyEvent.ModAlt) <> 0) then
+ if (kbS = THKeyEvent.ModAlt) then
begin
if pan.Enabled then g_Map_DisableWall(pan.arrIdx) else g_Map_EnableWall(pan.arrIdx);
end;
e_WriteLog(Format('mev: %d', [Integer(ev.kind)]), MSG_NOTIFY);
+ if (ev.but = THMouseEvent.Right) then
+ begin
+ // dump/toggle wall
+ e_WriteLog('=== TOGGLE WALL ===', MSG_NOTIFY);
+ mapGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, wallToggle, (GridTagWall or GridTagDoor));
+ e_WriteLog('--- toggle wall ---', MSG_NOTIFY);
+ exit;
+ end;
+
if (ev.but = THMouseEvent.Left) then
begin
- if ((kbS and THKeyEvent.ModShift) <> 0) then
+ if (kbS = THKeyEvent.ModAlt) then
begin
// dump monsters in cell
e_WriteLog('===========================', MSG_NOTIFY);
monsGrid.forEachInCell(pmsCurMapX, pmsCurMapY, monsInCell);
e_WriteLog('---------------------------', MSG_NOTIFY);
end
- else
+ else if (kbS = 0) then
begin
- // toggle wall
- e_WriteLog('=== TOGGLE WALL ===', MSG_NOTIFY);
- mapGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, wallToggle, (GridTagWall or GridTagDoor));
- e_WriteLog('--- toggle wall ---', MSG_NOTIFY);
+ monMarkedUID := -1;
+ e_WriteLog('===========================', MSG_NOTIFY);
+ monsGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, monsAtDump);
+ e_WriteLog('---------------------------', MSG_NOTIFY);
end;
exit;
end;
+end;
- if (ev.but = THMouseEvent.Right) then
+
+var
+ edgeBmp: array of Byte = nil;
+
+
+procedure drawOutlines ();
+var
+ r, g, b: Integer;
+
+ procedure clearEdgeBmp ();
begin
- monMarkedUID := -1;
- e_WriteLog('===========================', MSG_NOTIFY);
- monsGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, monsAtDump);
- e_WriteLog('---------------------------', MSG_NOTIFY);
- exit;
+ SetLength(edgeBmp, (gWinSizeX+4)*(gWinSizeY+4));
+ FillChar(edgeBmp[0], Length(edgeBmp)*sizeof(edgeBmp[0]), 0);
end;
-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;
-procedure plrDebugDraw ();
+var
+ lsx: Integer = -1;
+ lex: Integer = -1;
+ lsy: Integer = -1;
- procedure drawTileGrid ();
+ 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
- y := mapGrid.gridY0;
- while (y < mapGrid.gridY0+mapGrid.gridHeight) do
+ 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
- x := mapGrid.gridX0;
- while (x < mapGrid.gridX0+mapGrid.gridWidth) do
+ a := @edgeBmp[y*(gWinSizeX+4)+1];
+ startLine(y);
+ for x := 1 to vpw do
begin
- if (x+mapGrid.tileSize > vpx) and (y+mapGrid.tileSize > vpy) and
- (x < vpx+vpw) and (y < vpy+vph) then
+ if (a[0] <> 0) then
begin
- //e_DrawQuad(x, y, x+mapGrid.tileSize-1, y+mapGrid.tileSize-1, 96, 96, 96, 96);
- drawRect(x, y, mapGrid.tileSize, mapGrid.tileSize, 96, 96, 96, 255);
+ 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(x, mapGrid.tileSize);
+ 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;
- Inc(y, mapGrid.tileSize);
+ 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;
+
+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);
+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;
if showMonsInfo then
begin
//fillRect(mx-4, my-7*8-6, 110, 7*8+6, 0, 0, 94, 250);
- shadeRect(mx-4, my-7*8-6, 110, 7*8+6, 128);
+ darkenRect(mx-4, my-7*8-6, 110, 7*8+6, 128);
my -= 8;
my -= 2;
mon: TMonster;
mx, my, mw, mh: Integer;
begin
- //e_DrawPoint(4, plrMouseX, plrMouseY, 255, 0, 255);
if (gPlayer1 = nil) then exit;
- //e_WriteLog(Format('(%d,%d)-(%d,%d)', [laserX0, laserY0, laserX1, laserY1]), MSG_NOTIFY);
+ glEnable(GL_SCISSOR_TEST);
+ glScissor(0, gWinSizeY-gPlayerScreenSize.Y-1, vpw, vph);
glPushMatrix();
glTranslatef(-vpx, -vpy, 0);
if (showGrid) then drawTileGrid();
+ drawOutlines();
if (laserSet) then g_Mons_AlongLine(laserX0, laserY0, laserX1, laserY1, monsCollector, true);
glPopMatrix();
+ glDisable(GL_SCISSOR_TEST);
+
if showMapCurPos then drawText8(4, gWinSizeY-10, Format('mappos:(%d,%d)', [pmsCurMapX, pmsCurMapY]), 255, 255, 0);
end;
// ////////////////////////////////////////////////////////////////////////// //
-function g_Holmes_mouseEvent (var ev: THMouseEvent): Boolean;
+function g_Holmes_MouseEvent (var ev: THMouseEvent): Boolean;
begin
result := true;
msX := ev.x;
msB := ev.bstate;
kbS := ev.kstate;
msB := msB;
- plrDebugMouse(ev);
+ if not uiMouseEvent(ev) then plrDebugMouse(ev);
end;
pan: TPanel;
x, y, w, h: Integer;
ex, ey: Integer;
+ dx, dy: Integer;
procedure dummyWallTrc (cx, cy: Integer);
begin
SDL_SCANCODE_LSHIFT, SDL_SCANCODE_RSHIFT:
result := true;
end;
+ if uiKeyEvent(ev) then begin result := true; exit; end;
// press
if (ev.kind = THKeyEvent.Press) then
begin
// M-M: one monster think step
- if (ev.scan = SDL_SCANCODE_M) and ((ev.kstate and THKeyEvent.ModAlt) <> 0) then
+ if (ev = 'M-M') then
begin
result := true;
gmon_debug_think := false;
exit;
end;
// M-I: toggle monster info
- if (ev.scan = SDL_SCANCODE_I) and ((ev.kstate and THKeyEvent.ModAlt) <> 0) then
+ if (ev = 'M-I') then
begin
result := true;
showMonsInfo := not showMonsInfo;
exit;
end;
// M-L: toggle monster LOS to player
- if (ev.scan = SDL_SCANCODE_L) and ((ev.kstate and THKeyEvent.ModAlt) <> 0) then
+ if (ev = 'M-L') then
begin
result := true;
showMonsLOS2Plr := not showMonsLOS2Plr;
exit;
end;
// M-G: toggle "show all cells occupied by monsters"
- if (ev.scan = SDL_SCANCODE_G) and ((ev.kstate and THKeyEvent.ModAlt) <> 0) then
+ if (ev = 'M-G') then
begin
result := true;
showAllMonsCells := not showAllMonsCells;
exit;
end;
// M-A: wake up monster
- if (ev.scan = SDL_SCANCODE_A) and ((ev.kstate and THKeyEvent.ModAlt) <> 0) then
+ if (ev = 'M-A') then
begin
result := true;
if (monMarkedUID <> -1) then
exit;
end;
// C-T: teleport player
- if (ev.scan = SDL_SCANCODE_T) and ((ev.kstate and THKeyEvent.ModCtrl) <> 0) then
+ if (ev = 'C-T') then
begin
result := true;
//e_WriteLog(Format('TELEPORT: (%d,%d)', [pmsCurMapX, pmsCurMapY]), MSG_NOTIFY);
exit;
end;
// C-P: show cursor position on the map
- if (ev.scan = SDL_SCANCODE_P) and ((ev.kstate and THKeyEvent.ModCtrl) <> 0) then
+ if (ev = 'C-P') then
begin
result := true;
showMapCurPos := not showMapCurPos;
exit;
end;
// C-G: toggle grid
- if (ev.scan = SDL_SCANCODE_G) and ((ev.kstate and THKeyEvent.ModCtrl) <> 0) then
+ if (ev = 'C-G') then
begin
result := true;
showGrid := not showGrid;
exit;
end;
- // C-DOWN: trace down 10 pixels from cursor
- if (ev.scan = SDL_SCANCODE_DOWN) and ((ev.kstate and THKeyEvent.ModCtrl) <> 0) then
+ // C-L: toggle layers window
+ if (ev = 'C-L') then
+ begin
+ result := true;
+ showLayersWindow := not showLayersWindow;
+ toggleLayersWindow(nil, 0);
+ exit;
+ end;
+ // C-O: toggle outlines window
+ if (ev = 'C-O') then
+ begin
+ result := true;
+ showOutlineWindow := not showOutlineWindow;
+ toggleOutlineWindow(nil, 0);
+ exit;
+ end;
+ // F1: toggle options window
+ if (ev = 'F1') then
+ begin
+ result := true;
+ if (winHelp = nil) then createHelpWindow();
+ if not uiVisibleWindow(winHelp) then uiAddWindow(winHelp) else uiRemoveWindow(winHelp);
+ exit;
+ end;
+ // M-F1: toggle options window
+ if (ev = 'M-F1') then
begin
result := true;
+ if (winOptions = nil) then createOptionsWindow();
+ if not uiVisibleWindow(winOptions) then uiAddWindow(winOptions) else uiRemoveWindow(winOptions);
+ exit;
+ end;
+ {$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
+ begin
+ result := true;
+ dx := pmsCurMapX;
+ dy := pmsCurMapY;
+ case ev.scan of
+ SDL_SCANCODE_UP: dy -= 120;
+ SDL_SCANCODE_DOWN: dy += 120;
+ SDL_SCANCODE_LEFT: dx -= 120;
+ SDL_SCANCODE_RIGHT: dx += 120;
+ end;
{$IF DEFINED(D2F_DEBUG)}
- mapGrid.dbgRayTraceTileHitCB := dummyWallTrc;
+ //mapGrid.dbgRayTraceTileHitCB := dummyWallTrc;
+ mapGrid.dbgShowTraceLog := true;
{$ENDIF}
- pan := g_Map_traceToNearest(pmsCurMapX, pmsCurMapY, pmsCurMapX, pmsCurMapY+10, (GridTagWall or GridTagDoor or GridTagStep or GridTagAcid1 or GridTagAcid2 or GridTagWater), @ex, @ey);
+ pan := g_Map_traceToNearest(pmsCurMapX, pmsCurMapY, dx, dy, (GridTagWall or GridTagDoor or GridTagStep or GridTagAcid1 or GridTagAcid2 or GridTagWater), @ex, @ey);
{$IF DEFINED(D2F_DEBUG)}
- mapGrid.dbgRayTraceTileHitCB := nil;
+ //mapGrid.dbgRayTraceTileHitCB := nil;
+ mapGrid.dbgShowTraceLog := false;
{$ENDIF}
- e_LogWritefln('v-trace: (%d,%d)-(%d,%d); end=(%d,%d); hit=%d', [pmsCurMapX, pmsCurMapY, pmsCurMapX, pmsCurMapY+10, ex, ey, (pan <> nil)]);
+ e_LogWritefln('v-trace: (%d,%d)-(%d,%d); end=(%d,%d); hit=%d', [pmsCurMapX, pmsCurMapY, dx, dy, ex, ey, (pan <> nil)]);
exit;
end;
+ {$ENDIF}
end;
end;
plrDebugDraw();
end;
- //drawText6Prop(10, 10, 'Hi there, I''m Holmes!', 255, 255, 0);
- //drawText8Prop(10, 20, 'Hi there, I''m Holmes!', 255, 255, 0);
+ laserSet := false;
+end;
- drawCursor();
- laserSet := false;
+procedure g_Holmes_DrawUI ();
+begin
+ uiDraw();
+ drawCursor();
end;