Merge branch 'master' of ssh://repo.or.cz/d2df-sdl

[d2df-sdl.git] / src / game / g_holmes.pas

diff --git a/src/game/g_holmes.pas b/src/game/g_holmes.pas
index 965000a29597da84dbbe184d0b29e857e0ab60a2..c3c29df5646f86a93c0c3c6b42474c611f6dd17d 100644 (file)
--- a/src/game/g_holmes.pas
+++ b/src/game/g_holmes.pas
@@ -32,8 +32,8 @@ uses
 procedure g_Holmes_Draw ();
 procedure g_Holmes_DrawUI ();
 
-procedure g_Holmes_MouseEvent (var ev: THMouseEvent);
-procedure g_Holmes_KeyEvent (var ev: THKeyEvent);
+procedure g_Holmes_MouseEvent (var ev: TFUIMouseEvent);
+procedure g_Holmes_KeyEvent (var ev: TFUIKeyEvent);
 
 // hooks for player
 procedure g_Holmes_plrViewPos (viewPortX, viewPortY: Integer);
@@ -543,11 +543,11 @@ function pmsCurMapX (): Integer; inline; begin result := round(msX/g_dbg_scale)+
 function pmsCurMapY (): Integer; inline; begin result := round(msY/g_dbg_scale)+vpy; end;
 
 
-procedure plrDebugMouse (var ev: THMouseEvent);
+procedure plrDebugMouse (var ev: TFUIMouseEvent);
 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;
+  //if (ev.kind <> TFUIMouseEvent.Press) then exit;
   //e_WriteLog(Format('mev: %d', [Integer(ev.kind)]), MSG_NOTIFY);
   msbindExecute(ev);
 end;
@@ -1084,7 +1084,7 @@ procedure plrDebugDraw ();
     if showMonsInfo then
     begin
       //fillRect(mx-4, my-7*8-6, 110, 7*8+6, 0, 0, 94, 250);
-      hlmContext.font := 'msx';
+      hlmContext.font := 'msx6';
       hlmContext.color := TGxRGBA.Create(255, 127, 0);
 
       hlmContext.darkenRect(mx-4, my-7*hlmContext.charWidth(' ')-6, 110, 7*hlmContext.charWidth(' ')+6, 128);
@@ -1149,7 +1149,7 @@ procedure plrDebugDraw ();
     tts: AnsiString;
     tx: Integer;
   begin
-    hlmContext.font := 'msx';
+    hlmContext.font := 'msx6';
     hlmContext.color := TGxRGBA.Create(255, 0, 255, 96);
     hlmContext.fillRect(trig.x, trig.y, trig.width, trig.height);
     tts := trigType2Str(trig.TriggerType);
@@ -1308,7 +1308,7 @@ begin
   if showMapCurPos then
   begin
     gxSetContext(hlmContext);
-    hlmContext.font := 'dos';
+    hlmContext.font := 'win8';
     hlmContext.color := TGxRGBA.Create(255, 255, 0);
     hlmContext.drawText(4, gWinSizeY-10, Format('mappos:(%d,%d)', [pmsCurMapX, pmsCurMapY]));
     gxSetContext(nil);
@@ -1317,9 +1317,9 @@ end;
 
 
 // ////////////////////////////////////////////////////////////////////////// //
-procedure g_Holmes_MouseEvent (var ev: THMouseEvent);
+procedure g_Holmes_MouseEvent (var ev: TFUIMouseEvent);
 var
-  he: THMouseEvent;
+  he: TFUIMouseEvent;
 begin
   if g_Game_IsNet then exit;
   if not g_holmes_enabled then exit;
@@ -1336,13 +1336,13 @@ begin
   he.x := he.x;
   he.y := he.y;
   uiMouseEvent(he);
-  if (not he.eaten) then plrDebugMouse(he);
+  if (he.alive) then plrDebugMouse(he);
   ev.eat();
 end;
 
 
 // ////////////////////////////////////////////////////////////////////////// //
-procedure g_Holmes_KeyEvent (var ev: THKeyEvent);
+procedure g_Holmes_KeyEvent (var ev: TFUIKeyEvent);
 var
   doeat: Boolean = false;
 {$IF DEFINED(D2F_DEBUG)}
@@ -1373,7 +1373,7 @@ begin
   end;
 
   uiKeyEvent(ev);
-  if (ev.eaten) then exit;
+  if (not ev.alive) then exit;
   if keybindExecute(ev) then begin ev.eat(); exit; end;
   // press
   if (ev.press) then
@@ -1381,7 +1381,7 @@ 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 TFUIKeyEvent.ModCtrl) <> 0) then
     begin
       ev.eat();
       dx := pmsCurMapX;
@@ -1715,14 +1715,14 @@ begin
 end;
 
 
-procedure onMouseEvent (var ev: THMouseEvent);
+procedure onMouseEvent (var ev: TFUIMouseEvent);
 begin
   if not g_holmes_enabled then exit;
   if g_holmes_imfunctional then exit;
   g_Holmes_MouseEvent(ev);
 end;
 
-procedure onKeyEvent (var ev: THKeyEvent);
+procedure onKeyEvent (var ev: TFUIKeyEvent);
 begin
   if not g_holmes_enabled then exit;
   if g_holmes_imfunctional then exit;
@@ -1733,6 +1733,7 @@ end;
 begin
   evMouseCB := onMouseEvent;
   evKeyCB := onKeyEvent;
+  //uiContext.font := 'win14';
 
   conRegVar('hlm_ui_scale', @fuiRenderScale, 0.01, 5.0, 'Holmes UI scale', '', false);
 end.