index be9192d8a0a8e0aeec87ba210fea2f61d9745f88..135141e69ca752e333f82730d8b9a251877df077 100644 (file)
{$ELSE}
GL, GLEXT,
{$ENDIF}
{$ELSE}
GL, GLEXT,
{$ENDIF}
+ {$IFDEF ENABLE_MENU}
+ r_gui,
+ {$ENDIF}
{$IFDEF ENABLE_SYSTEM}
g_system,
{$ENDIF}
{$IFDEF ENABLE_SYSTEM}
g_system,
{$ENDIF}
e_log, utils,
g_game, g_options, g_console, g_player, g_weapons, g_language,
g_net,
e_log, utils,
g_game, g_options, g_console, g_player, g_weapons, g_language,
g_net,
- r_draw, r_textures, r_fonts, r_map
+ r_draw, r_textures, r_fonts, r_common, r_console, r_map
;
type
;
type
var
menuBG: TGLTexture;
var
menuBG: TGLTexture;
- stdfont: TGLFont;
- smallfont: TGLFont;
- menufont: TGLFont;
-
hud, hudbg: TGLTexture;
hudhp: array [Boolean] of TGLTexture;
hudap: TGLTexture;
hud, hudbg: TGLTexture;
hudhp: array [Boolean] of TGLTexture;
hudap: TGLTexture;
r_Map_FreeTextures;
end;
r_Map_FreeTextures;
end;
- function r_Render_LoadFont (const name: AnsiString): TGLFont;
- var info: TFontInfo; skiphack: Integer;
- begin
- result := nil;
- if name = 'STD' then skiphack := 144 else skiphack := 0;
- if r_Font_LoadInfoFromFile(GameWad + ':FONTS/' + name + 'TXT', info) then
- result := r_Textures_LoadFontFromFile(GameWad + ':FONTS/' + name + 'FONT', info, skiphack, true);
- if result = nil then
- e_logwritefln('failed to load font %s', [name]);
- end;
-
procedure r_Render_Load;
const
WeapName: array [0..WP_LAST] of AnsiString = ('KASTET', 'SAW', 'PISTOL', 'SHOTGUN1', 'SHOTGUN2', 'MGUN', 'RLAUNCHER', 'PGUN', 'BFG', 'SPULEMET', 'FLAMETHROWER');
var
i: Integer;
begin
procedure r_Render_Load;
const
WeapName: array [0..WP_LAST] of AnsiString = ('KASTET', 'SAW', 'PISTOL', 'SHOTGUN1', 'SHOTGUN2', 'MGUN', 'RLAUNCHER', 'PGUN', 'BFG', 'SPULEMET', 'FLAMETHROWER');
var
i: Integer;
begin
+ r_Common_Load;
menuBG := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/TITLE');
menuBG := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/TITLE');
- stdfont := r_Render_LoadFont('STD');
- smallfont := r_Render_LoadFont('SMALL');
- menufont := r_Render_LoadFont('MENU');
hud := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/HUD');
hudbg := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/HUDBG');
hudhp[false] := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/MED2');
hud := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/HUD');
hudbg := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/HUDBG');
hudhp[false] := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/MED2');
hudkey[2] := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/KEYB');
hudair := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/AIRBAR');
hudjet := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/JETBAR');
hudkey[2] := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/KEYB');
hudair := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/AIRBAR');
hudjet := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/JETBAR');
+ r_Console_Load;
r_Map_Load;
r_Map_Load;
+ {$IFDEF ENABLE_MENU}
+ r_GUI_Load;
+ {$ENDIF}
end;
procedure r_Render_Free;
var i: Integer;
begin
end;
procedure r_Render_Free;
var i: Integer;
begin
+ {$IFDEF ENABLE_MENU}
+ r_GUI_Free;
+ {$ENDIF}
r_Map_Free;
r_Map_Free;
+ r_Console_Free;
hudjet.Free;
hudair.Free;
hudkey[0].Free;
hudjet.Free;
hudair.Free;
hudkey[0].Free;
hudhp[false].Free;
hudbg.Free;
hud.Free;
hudhp[false].Free;
hudbg.Free;
hud.Free;
- menufont.Free;
- smallfont.Free;
- stdfont.Free;
menuBG.Free;
menuBG.Free;
+ r_Common_Free;
end;
{$IFDEF ENABLE_SYSTEM}
end;
{$IFDEF ENABLE_SYSTEM}
sys_EnableVSync(gVSync);
{$ENDIF}
r_Textures_Initialize;
sys_EnableVSync(gVSync);
{$ENDIF}
r_Textures_Initialize;
+ r_Console_Initialize;
r_Map_Initialize;
end;
procedure r_Render_Finalize;
begin
r_Map_Finalize;
r_Map_Initialize;
end;
procedure r_Render_Finalize;
begin
r_Map_Finalize;
+ r_Console_Finalize;
r_Textures_Finalize;
end;
procedure r_Render_Update;
begin
r_Textures_Finalize;
end;
procedure r_Render_Update;
begin
+ r_Console_Update;
r_Map_Update;
end;
r_Map_Update;
end;
{$IFDEF ENABLE_MENU}
if g_ActiveWindow <> nil then
begin
{$IFDEF ENABLE_MENU}
if g_ActiveWindow <> nil then
begin
- // TODO draw menu widgets
+ if gGameOn then
+ r_Draw_FillRect(0, 0, gScreenWidth - 1, gScreenHeight - 1, 0, 0, 0, 105);
+ r_GUI_Draw_Window(g_ActiveWindow);
end;
{$ENDIF}
end;
{$ENDIF}
- // TODO draw console
+ r_Console_Draw(false);
// TODO draw holmes interface
// TODO draw holmes interface
{$IFDEF ENABLE_MENU}
procedure r_Render_GetControlSize (ctrl: TGUIControl; out w, h: Integer);
begin
{$IFDEF ENABLE_MENU}
procedure r_Render_GetControlSize (ctrl: TGUIControl; out w, h: Integer);
begin
- w := 0; h := 0;
+ r_GUI_GetSize(ctrl, w, h);
end;
procedure r_Render_GetLogoSize (out w, h: Integer);
begin
end;
procedure r_Render_GetLogoSize (out w, h: Integer);
begin
- w := 0; h := 0;
+ r_GUI_GetLogoSize(w, h);
end;
procedure r_Render_GetMaxFontSize (BigFont: Boolean; out w, h: Integer);
begin
end;
procedure r_Render_GetMaxFontSize (BigFont: Boolean; out w, h: Integer);
begin
- w := 0; h := 0;
+ r_GUI_GetMaxFontSize(BigFont, w, h);
end;
procedure r_Render_GetStringSize (BigFont: Boolean; str: String; out w, h: Integer);
begin
end;
procedure r_Render_GetStringSize (BigFont: Boolean; str: String; out w, h: Integer);
begin
- w := 0; h := 0;
+ r_GUI_GetStringSize(BigFont, str, w, h);
end;
{$ENDIF}
procedure r_Render_DrawLoading (force: Boolean);
begin
end;
{$ENDIF}
procedure r_Render_DrawLoading (force: Boolean);
begin
+ // TODO draw loading screen
end;
end.
end;
end.