index 5a15b28869ec57ca5f3e30b1e18ed8fa19cb4e97..80783b6d7f82784d21db3a21ab4e1b90d29e7719 100644 (file)
{$IFDEF ENABLE_SYSTEM}
g_system,
{$ENDIF}
+ {$IFDEF ENABLE_TOUCH}
+ r_touch,
+ {$ENDIF}
{$IFDEF ENABLE_HOLMES}
r_holmes,
{$ENDIF}
end;
procedure r_Render_DrawHUDArea (x, y, w, h: Integer; p: TPlayer);
- var s: AnsiString;
+ var s: AnsiString; oldy: Integer;
begin
r_Common_DrawTexture(hudbg, x, y, w, h, TBasePoint.BP_LEFTUP);
if p <> nil then
begin
+ oldy := y;
+ if h < 239 then y := y - 32; (* hack: hide nickname on 640x400 *)
r_Render_DrawHUD(x + w - 196 + 2, y, p);
if p.Spectator then
begin
if p.NoRespawn then
r_Common_DrawText(_lc[I_PLAYER_SPECT1S], x + 4, y + 290, 255, 255, 255, 255, stdfont, TBasePoint.BP_LEFTUP);
end;
+ y := oldy;
end;
if gShowPing and g_Game_IsClient then
FPSTime := time;
end;
- r_Draw_Setup(gScreenWidth, gScreenHeight);
+ r_Draw_Setup(gWinSizeX, gWinSizeY, gScreenWidth, gScreenHeight);
glClearColor(0.0, 0.0, 0.0, 0.0);
glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT);
r_Holmes_DrawUI;
{$ENDIF}
- // TODO draw touch screen controls
+ {$IFDEF ENABLE_TOUCH}
+ r_Touch_Draw;
+ {$ENDIF}
sys_Repaint;
end;
gWinSizeY := h;
gRC_Width := w;
gRC_Height := h;
- gScreenWidth := w;
- gScreenHeight := h;
+ gScreenWidth := Round(w / r_pixel_scale);
+ gScreenHeight := Round(h / r_pixel_scale);
end;
procedure r_Render_Apply;
{$IFDEF ENABLE_TOUCH}
procedure r_Render_GetKeyRect (key: Integer; out x, y, w, h: Integer; out founded: Boolean);
begin
- // TODO implement touchscreen
- founded := False;
+ r_Touch_GetKeyRect(key, x, y, w, h, founded)
end;
{$ENDIF}