diff --git a/src/game/g_holmes.pas b/src/game/g_holmes.pas
index 75e03bb30ec82a3a6509fc830fc790992a384103..39669fa1d8dd922c7a08c7cc2ed3080993c94137 100644 (file)
--- a/src/game/g_holmes.pas
+++ b/src/game/g_holmes.pas
WheelDown = $0010;
// event types
- Motion = 0;
+ Release = 0;
Press = 1;
- Release = 2;
+ 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 button or 0
+ 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
end;
implementation
uses
- SysUtils, GL,
+ SysUtils, GL, SDL2,
MAPDEF, g_options;
msY: Integer = -666;
msB: Word = 0; // button state
kbS: Word = 0; // keyboard modifiers state
+ showMonsInfo: Boolean = false;
// ////////////////////////////////////////////////////////////////////////// //
//if pan.Enabled then g_Map_DisableWall(pan.arrIdx) else g_Map_EnableWall(pan.arrIdx);
end;
+ function monsInCell (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);
+ end;
+
begin
//e_WriteLog(Format('mouse: x=%d; y=%d; but=%d; bstate=%d', [msx, msy, but, bstate]), MSG_NOTIFY);
if (gPlayer1 = nil) then exit;
if (ev.but = THMouseEvent.Left) then
begin
- mapGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, wallToggle, (GridTagWall or GridTagDoor));
+ if ((kbS and THKeyEvent.ModShift) <> 0) then
+ begin
+ // dump monsters in cell
+ e_WriteLog('===========================', MSG_NOTIFY);
+ monsGrid.forEachInCell(pmsCurMapX, pmsCurMapY, monsInCell);
+ e_WriteLog('---------------------------', MSG_NOTIFY);
+ end
+ else
+ begin
+ // toggle wall
+ mapGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, wallToggle, (GridTagWall or GridTagDoor));
+ end;
exit;
end;
procedure plrDebugDraw ();
+ procedure drawTileGrid ();
+ var
+ x, y: Integer;
+ begin
+ y := mapGrid.gridY0;
+ while (y < mapGrid.gridY0+mapGrid.gridHeight) do
+ begin
+ x := mapGrid.gridX0;
+ while (x < mapGrid.gridX0+mapGrid.gridWidth) do
+ begin
+ if (x+mapGrid.tileSize > vpx) and (y+mapGrid.tileSize > vpy) and
+ (x < vpx+vpw) and (y < vpy+vph) 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);
+ end;
+ Inc(x, mapGrid.tileSize);
+ end;
+ Inc(y, mapGrid.tileSize);
+ end;
+ end;
+
+ procedure hilightCell (cx, cy: Integer);
+ begin
+ fillRect(cx, cy, monsGrid.tileSize, monsGrid.tileSize, 0, 128, 0, 64);
+ end;
+
function monsCollector (mon: TMonster; tag: Integer): Boolean;
var
ex, ey: Integer;
procedure drawMonsterInfo (mon: TMonster);
var
mx, my, mw, mh: Integer;
- emx, emy, emw, emh: Integer;
- enemy: TMonster;
- eplr: TPlayer;
+
+ 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, 128);
+ 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, 128);
+ end;
+ end;
+
begin
if (mon = nil) then exit;
mon.getMapBox(mx, my, mw, mh);
//mx += mw div 2;
- //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);
- 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;
+ monsGrid.forEachBodyCell(mon.proxyId, hilightCell);
- mon.getMapBox(mx, my, mw, mh);
- if (g_GetUIDType(mon.MonsterTargetUID) = UID_PLAYER) then
+ if showMonsInfo then
begin
- eplr := g_Player_Get(mon.MonsterTargetUID);
- if (eplr <> nil) then
- begin
- eplr.getMapBox(emx, emy, emw, emh);
- drawLine(mx+mw div 2, my+mh div 2, emx+emw div 2, emy+emh div 2, 255, 0, 0, 128);
- end;
- end
- else if (g_GetUIDType(mon.MonsterTargetUID) = UID_MONSTER) then
- begin
- enemy := g_Monsters_ByUID(mon.MonsterTargetUID);
- if (enemy <> nil) then
- begin
- enemy.getMapBox(emx, emy, emw, emh);
- drawLine(mx+mw div 2, my+mh div 2, emx+emw div 2, emy+emh div 2, 255, 0, 0, 128);
- end;
+ //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);
+ 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();
{
property MonsterRemoved: Boolean read FRemoved write FRemoved;
property MonsterPain: Integer read FPain write FPain;
glPushMatrix();
glTranslatef(-vpx, -vpy, 0);
+ drawTileGrid();
+
g_Mons_AlongLine(laserX0, laserY0, laserX1, laserY1, monsCollector, true);
if (monMarkedUID <> -1) then
end;
-{
- procedure drawTileGrid ();
- var
- x, y: Integer;
- begin
- y := mapGrid.gridY0;
- while (y < mapGrid.gridY0+mapGrid.gridHeight) do
- begin
- x := mapGrid.gridX0;
- while (x < mapGrid.gridX0+mapGrid.gridWidth) do
- begin
- if (x+mapGrid.tileSize > vpx) and (y+mapGrid.tileSize > vpy) and
- (x < vpx+vpw) and (y < vpy+vph) then
- begin
- e_DrawQuad(x, y, x+mapGrid.tileSize-1, y+mapGrid.tileSize-1, 96, 96, 96, 96);
- end;
- Inc(x, mapGrid.tileSize);
- end;
- Inc(y, mapGrid.tileSize);
- end;
- end;
-}
-
-
// ////////////////////////////////////////////////////////////////////////// //
function g_Holmes_mouseEvent (var ev: THMouseEvent): Boolean;
begin
function g_Holmes_KeyEvent (var ev: THKeyEvent): Boolean;
begin
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;
+ // 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
+ begin
+ result := true;
+ gmon_debug_think := false;
+ gmon_debug_one_think_step := true; // do one step
+ exit;
+ end;
+ // M-I: toggle monster info
+ if (ev.scan = SDL_SCANCODE_I) and ((ev.kstate and THKeyEvent.ModAlt) <> 0) then
+ begin
+ result := true;
+ showMonsInfo := not showMonsInfo;
+ exit;
+ end;
+ end;
end;