diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index 2f6ce09122ea1f2daa5bb42d879b57949bd9fe90..879b9c915cfd5fdc68840d2f8332530f236b4e58 100644 (file)
--- a/src/game/g_menu.pas
+++ b/src/game/g_menu.pas
procedure g_Menu_Init();
procedure g_Menu_Free();
procedure g_Menu_Reset();
-procedure LoadStdFont(cfgres, texture: string; var FontID: DWORD);
-procedure LoadFont(txtres, fntres: string; var FontID: DWORD);
procedure g_Menu_AskLanguage();
procedure g_Menu_Show_SaveMenu();
procedure g_Menu_Show_QuitGameMenu();
var
- gMenuFont: DWORD;
- gMenuSmallFont: DWORD;
PromptIP: string;
PromptPort: Word;
TempScale: Integer = -1;
implementation
uses
- {$INCLUDE ../nogl/noGLuses.inc}
- g_gui, g_textures, e_graphics, g_main, g_window, g_game, g_map,
- g_basic, g_console, g_sound, g_gfx, g_player, g_options, g_weapons,
+ {$IFDEF ENABLE_GFX}
+ g_gfx,
+ {$ENDIF}
+ {$IFDEF ENABLE_GIBS}
+ g_gibs,
+ {$ENDIF}
+ {$IFDEF ENABLE_SHELLS}
+ g_shells,
+ {$ENDIF}
+ {$IFDEF ENABLE_CORPSES}
+ g_corpses,
+ {$ENDIF}
+ {$IFDEF ENABLE_RENDER}
+ r_render,
+ {$ENDIF}
+ {$IFDEF ENABLE_SYSTEM}
+ g_system,
+ {$ENDIF}
+ g_gui, g_game, g_map,
+ g_base, g_basic, g_console, g_sound, g_player, g_options, g_weapons,
e_log, SysUtils, CONFIG, g_playermodel, DateUtils,
MAPDEF, Math, g_saveload,
- e_texture, g_language, e_res,
- g_net, g_netmsg, g_netmaster, g_items, e_input, g_touch,
- utils, wadreader, g_system;
+ g_language, e_res,
+ g_net, g_netmsg, g_netmaster, g_items, e_input,
+ utils, wadreader;
type TYNCallback = procedure (yes:Boolean);
TYNCallback(ctl.UserData)(false);
end;
-function CreateYNMenu (WinName, Text: String; MaxLen: Word; FontID: DWORD; ActionProc: TYNCallback): TGUIWindow;
+function CreateYNMenu (WinName, Text: String; MaxLen: Word; ActionProc: TYNCallback): TGUIWindow;
var
menu: TGUIMenu;
begin
begin
//OnKeyDownEx := @YNKeyDownProc;
//UserData := @ActionProc;
- menu := TGUIMenu(Result.AddChild(TGUIMenu.Create(gMenuSmallFont, gMenuSmallFont, '')));
+ menu := TGUIMenu(Result.AddChild(TGUIMenu.Create(False, False, '')));
with menu do
begin
Name := '__temp_yes_no_menu:'+WinName;
var
menu: TGUIMenu;
i: Integer;
- ovs: Boolean;
begin
menu := TGUIMenu(g_GUI_GetWindow('OptionsVideoMenu').GetControl('mOptionsVideoMenu'));
else
gBPP := 32;
- ovs := gVSync;
gVSync := TGUISwitch(menu.GetControl('swVSync')).ItemIndex = 0;
- if (ovs <> gVSync) then
- sys_EnableVSync(gVSync);
gTextureFilter := TGUISwitch(menu.GetControl('swTextureFilter')).ItemIndex = 0;
glNPOTOverride := not (TGUISwitch(menu.GetControl('swLegacyNPOT')).ItemIndex = 0);
menu := TGUIMenu(g_GUI_GetWindow('OptionsGameMenu').GetControl('mOptionsGameMenu'));
- g_GFX_SetMax(TGUIScroll(menu.GetControl('scParticlesCount')).Value*1000);
- g_Shells_SetMax(TGUIScroll(menu.GetControl('scShellsMax')).Value*30);
- g_Gibs_SetMax(TGUIScroll(menu.GetControl('scGibsMax')).Value*25);
- g_Corpses_SetMax(TGUIScroll(menu.GetControl('scCorpsesMax')).Value*5);
-
- case TGUISwitch(menu.GetControl('swGibsCount')).ItemIndex of
- 0: gGibsCount := 0;
- 1: gGibsCount := 8;
- 2: gGibsCount := 16;
- 3: gGibsCount := 32;
- else gGibsCount := 48;
- end;
+ {$IFDEF ENABLE_GFX}
+ g_GFX_SetMax(TGUIScroll(menu.GetControl('scParticlesCount')).Value*1000);
+ {$ENDIF}
+ {$IFDEF ENABLE_SHELLS}
+ g_Shells_SetMax(TGUIScroll(menu.GetControl('scShellsMax')).Value*30);
+ {$ENDIF}
+ {$IFDEF ENABLE_GIBS}
+ g_Gibs_SetMax(TGUIScroll(menu.GetControl('scGibsMax')).Value*25);
+ {$ENDIF}
+ {$IFDEF ENABLE_CORPSES}
+ g_Corpses_SetMax(TGUIScroll(menu.GetControl('scCorpsesMax')).Value*5);
+ {$ENDIF}
+
+ {$IFDEF ENABLE_GIBS}
+ case TGUISwitch(menu.GetControl('swGibsCount')).ItemIndex of
+ 0: gGibsCount := 0;
+ 1: gGibsCount := 8;
+ 2: gGibsCount := 16;
+ 3: gGibsCount := 32;
+ else gGibsCount := 48;
+ end;
+ {$ENDIF}
gBloodCount := TGUISwitch(menu.GetControl('swBloodCount')).ItemIndex;
gFlash := TGUISwitch(menu.GetControl('swScreenFlash')).ItemIndex;
with menu do
begin
g_Console_BindKey(g_Console_FindBind(1, 'screenshot'), '');
- g_Console_BindKey(g_Console_FindBind(1, '+p1_scores', '-p1_scores'), '');
+ g_Console_BindKey(g_Console_FindBind(1, '+scores', '-scores'), '');
g_Console_BindKey(g_Console_FindBind(1, 'togglechat'), '');
g_Console_BindKey(g_Console_FindBind(1, 'toggleteamchat'), '');
g_Console_BindKey(TGUIKeyRead(GetControl(_lc[I_MENU_CONTROL_SCREENSHOT])).Key, 'screenshot');
- g_Console_BindKey(TGUIKeyRead(GetControl(_lc[I_MENU_CONTROL_STAT])).Key, '+p1_scores', '-p1_scores');
+ g_Console_BindKey(TGUIKeyRead(GetControl(_lc[I_MENU_CONTROL_STAT])).Key, '+scores', '-scores');
g_Console_BindKey(TGUIKeyRead(GetControl(_lc[I_MENU_CONTROL_CHAT])).Key, 'togglechat');
g_Console_BindKey(TGUIKeyRead(GetControl(_lc[I_MENU_CONTROL_TEAMCHAT])).Key, 'toggleteamchat');
end;
end;
menu := TGUIMenu(g_GUI_GetWindow('OptionsPlayersP1Menu').GetControl('mOptionsPlayersP1Menu'));
-
gPlayer1Settings.Name := b_Text_Unformat(TGUIEdit(menu.GetControl('edP1Name')).Text);
gPlayer1Settings.Team := IfThen(TGUISwitch(menu.GetControl('swP1Team')).ItemIndex = 0,
TEAM_RED, TEAM_BLUE);
-
with TGUIModelView(g_GUI_GetWindow('OptionsPlayersP1Menu').GetControl('mvP1Model')) do
begin
- gPlayer1Settings.Model := Model.Name;
+ gPlayer1Settings.Model := Model.GetName();
gPlayer1Settings.Color := Model.Color;
end;
- menu := TGUIMenu(g_GUI_GetWindow('OptionsPlayersP1Menu').GetControl('mOptionsPlayersP1Menu'));
-
- gPlayer1Settings.Name := b_Text_Unformat(TGUIEdit(menu.GetControl('edP1Name')).Text);
- gPlayer1Settings.Team := IfThen(TGUISwitch(menu.GetControl('swP1Team')).ItemIndex = 0,
+ menu := TGUIMenu(g_GUI_GetWindow('OptionsPlayersP2Menu').GetControl('mOptionsPlayersP2Menu'));
+ gPlayer2Settings.Name := b_Text_Unformat(TGUIEdit(menu.GetControl('edP2Name')).Text);
+ gPlayer2Settings.Team := IfThen(TGUISwitch(menu.GetControl('swP2Team')).ItemIndex = 0,
TEAM_RED, TEAM_BLUE);
-
- with TGUIModelView(g_GUI_GetWindow('OptionsPlayersP1Menu').GetControl('mvP1Model')) do
+ with TGUIModelView(g_GUI_GetWindow('OptionsPlayersP2Menu').GetControl('mvP2Model')) do
begin
- gPlayer1Settings.Model := Model.Name;
- gPlayer1Settings.Color := Model.Color;
+ gPlayer2Settings.Model := Model.GetName();
+ gPlayer2Settings.Color := Model.Color;
end;
menu := TGUIMenu(g_GUI_GetWindow('OptionsPlayersP1WeaponMenu').GetControl('mOptionsPlayersP1WeaponMenu'));
- gPlayer1Settings.WeaponSwitch := TGUISwitch(menu.GetControl('swWeaponAutoswitch')).ItemIndex;
-
+ gPlayer1Settings.WeaponSwitch := TGUISwitch(menu.GetControl('swWeaponAutoswitch')).ItemIndex;
+ gPlayer1Settings.SwitchToEmpty := TGUISwitch(menu.GetControl('swWeaponAllowEmpty')).ItemIndex;
+ gPlayer1Settings.SkipFist := TGUISwitch(menu.GetControl('swWeaponAllowFist')).ItemIndex;
menu := TGUIMenu(g_GUI_GetWindow('OptionsPreferencesP1WeaponMenu').GetControl('mOptionsPreferencesP1WeaponMenu'));
with menu do
begin
end;
menu := TGUIMenu(g_GUI_GetWindow('OptionsPlayersP2WeaponMenu').GetControl('mOptionsPlayersP2WeaponMenu'));
- gPlayer2Settings.WeaponSwitch := TGUISwitch(menu.GetControl('swWeaponAutoswitch')).ItemIndex;
-
+ gPlayer2Settings.WeaponSwitch := TGUISwitch(menu.GetControl('swWeaponAutoswitch')).ItemIndex;
+ gPlayer2Settings.SwitchToEmpty := TGUISwitch(menu.GetControl('swWeaponAllowEmpty')).ItemIndex;
+ gPlayer2Settings.SkipFist := TGUISwitch(menu.GetControl('swWeaponAllowFist')).ItemIndex;
menu := TGUIMenu(g_GUI_GetWindow('OptionsPreferencesP2WeaponMenu').GetControl('mOptionsPreferencesP2WeaponMenu'));
with menu do
begin
end;
end;
- menu := TGUIMenu(g_GUI_GetWindow('OptionsPlayersP2Menu').GetControl('mOptionsPlayersP2Menu'));
-
- gPlayer2Settings.Name := b_Text_Unformat(TGUIEdit(menu.GetControl('edP2Name')).Text);
- gPlayer2Settings.Team := IfThen(TGUISwitch(menu.GetControl('swP2Team')).ItemIndex = 0,
- TEAM_RED, TEAM_BLUE);
- with TGUIModelView(g_GUI_GetWindow('OptionsPlayersP2Menu').GetControl('mvP2Model')) do
- begin
- gPlayer2Settings.Model := Model.Name;
- gPlayer2Settings.Color := Model.Color;
- end;
-
if gPlayer1Settings.Name = '' then gPlayer1Settings.Name := GenPlayerName(1);
if gPlayer2Settings.Name = '' then gPlayer2Settings.Name := GenPlayerName(2);
else
if gPlayer1.Team <> gPlayer1Settings.Team then
gPlayer1.SwitchTeam;
-
+ gPlayer1.WeapSwitchMode := gPlayer1Settings.WeaponSwitch;
+ gPlayer1.setWeaponPrefs(gPlayer1Settings.WeaponPreferences);
+ gPlayer1.SwitchToEmpty := gPlayer1Settings.SwitchToEmpty;
+ gPlayer1.SkipFist := gPlayer1Settings.SkipFist;
if g_Game_IsNet then MH_SEND_PlayerSettings(gPlayer1.UID);
end;
begin
gPlayer2.SetModel(gPlayer2Settings.Model);
gPlayer2.Name := gPlayer2Settings.Name;
- if (gGameSettings.GameMode <> GM_TDM) and (gGameSettings.GameMode <> GM_CTF) then
+ if not (gGameSettings.GameMode in [GM_TDM, GM_CTF]) then
gPlayer2.SetColor(gPlayer2Settings.Color)
else
if gPlayer2.Team <> gPlayer2Settings.Team then
gPlayer2.SwitchTeam;
+ gPlayer2.WeapSwitchMode := gPlayer2Settings.WeaponSwitch;
+ gPlayer2.setWeaponPrefs(gPlayer2Settings.WeaponPreferences);
+ gPlayer2.SwitchToEmpty := gPlayer2Settings.SwitchToEmpty;
+ gPlayer2.SkipFist := gPlayer2Settings.SkipFist;
+ //if g_Game_IsNet then MH_SEND_PlayerSettings(gPlayer2.UID);
end;
end;
- if g_Game_IsClient then MC_SEND_PlayerSettings;
+ if g_Game_IsClient then
+ begin
+ MC_SEND_PlayerSettings;
+ gPlayer1.setWeaponPrefs(gPlayer1Settings.WeaponPreferences);
+ end;
g_Console_WriteGameConfig;
end;
procedure ReadOptions();
var
menu: TGUIMenu;
- i, a: Integer;
+ i: Integer;
begin
menu := TGUIMenu(g_GUI_GetWindow('OptionsVideoMenu').GetControl('mOptionsVideoMenu'));
with menu do
begin
TGUIKeyRead(GetControl(_lc[I_MENU_CONTROL_SCREENSHOT])).Key := g_Console_FindBind(1, 'screenshot');
- TGUIKeyRead(GetControl(_lc[I_MENU_CONTROL_STAT])).Key := g_Console_FindBind(1, '+p1_scores', '-p1_scores');
+ TGUIKeyRead(GetControl(_lc[I_MENU_CONTROL_STAT])).Key := g_Console_FindBind(1, '+scores', '-scores');
TGUIKeyRead(GetControl(_lc[I_MENU_CONTROL_CHAT])).Key := g_Console_FindBind(1, 'togglechat');
TGUIKeyRead(GetControl(_lc[I_MENU_CONTROL_TEAMCHAT])).Key := g_Console_FindBind(1, 'toggleteamchat');
end;
menu := TGUIMenu(g_GUI_GetWindow('OptionsGameMenu').GetControl('mOptionsGameMenu'));
- TGUIScroll(menu.GetControl('scParticlesCount')).Value := g_GFX_GetMax() div 1000;
- TGUIScroll(menu.GetControl('scShellsMax')).Value := g_Shells_GetMax() div 30;
- TGUIScroll(menu.GetControl('scGibsMax')).Value := g_Gibs_GetMax() div 25;
- TGUIScroll(menu.GetControl('scCorpsesMax')).Value := g_Corpses_GetMax() div 5;
+ {$IFDEF ENABLE_GFX}
+ TGUIScroll(menu.GetControl('scParticlesCount')).Value := g_GFX_GetMax() div 1000;
+ {$ENDIF}
+ {$IFDEF ENABLE_SHELLS}
+ TGUIScroll(menu.GetControl('scShellsMax')).Value := g_Shells_GetMax() div 30;
+ {$ENDIF}
+ {$IFDEF ENABLE_GIBS}
+ TGUIScroll(menu.GetControl('scGibsMax')).Value := g_Gibs_GetMax() div 25;
+ {$ENDIF}
+ {$IFDEF ENABLE_CORPSES}
+ TGUIScroll(menu.GetControl('scCorpsesMax')).Value := g_Corpses_GetMax() div 5;
+ {$ENDIF}
TGUISwitch(menu.GetControl('swBloodCount')).ItemIndex := gBloodCount;
with TGUISwitch(menu.GetControl('swScreenFlash')) do
with TGUISwitch(menu.GetControl('swGibsType')) do
if gAdvGibs then ItemIndex := 1 else ItemIndex := 0;
- with TGUISwitch(menu.GetControl('swGibsCount')) do
- case gGibsCount of
- 0: ItemIndex := 0;
- 8: ItemIndex := 1;
- 16: ItemIndex := 2;
- 32: ItemIndex := 3;
- else ItemIndex := 4;
+ {$IFDEF ENABLE_GIBS}
+ with TGUISwitch(menu.GetControl('swGibsCount')) do
+ begin
+ case gGibsCount of
+ 0: ItemIndex := 0;
+ 8: ItemIndex := 1;
+ 16: ItemIndex := 2;
+ 32: ItemIndex := 3;
+ else ItemIndex := 4;
+ end;
end;
+ {$ENDIF}
with TGUISwitch(menu.GetControl('swBackGround')) do
if gDrawBackGround then ItemIndex := 0 else ItemIndex := 1;
menu := TGUIMenu(g_GUI_GetWindow('OptionsPlayersP1WeaponMenu').GetControl('mOptionsPlayersP1WeaponMenu'));
TGUISwitch(menu.GetControl('swWeaponAutoswitch')).ItemIndex := gPlayer1Settings.WeaponSwitch;
-
+ TGUISwitch(menu.GetControl('swWeaponAllowEmpty')).ItemIndex := gPlayer1Settings.SwitchToEmpty;
+ TGUISwitch(menu.GetControl('swWeaponAllowFist')).ItemIndex := gPlayer1Settings.SkipFist;
menu := TGUIMenu(g_GUI_GetWindow('OptionsPreferencesP1WeaponMenu').GetControl('mOptionsPreferencesP1WeaponMenu'));
for i := WP_FIRST to WP_LAST+1 do
begin
menu := TGUIMenu(g_GUI_GetWindow('OptionsPlayersP2WeaponMenu').GetControl('mOptionsPlayersP2WeaponMenu'));
TGUISwitch(menu.GetControl('swWeaponAutoswitch')).ItemIndex := gPlayer2Settings.WeaponSwitch;
-
+ TGUISwitch(menu.GetControl('swWeaponAllowEmpty')).ItemIndex := gPlayer2Settings.SwitchToEmpty;
+ TGUISwitch(menu.GetControl('swWeaponAllowFist')).ItemIndex := gPlayer2Settings.SkipFist;
menu := TGUIMenu(g_GUI_GetWindow('OptionsPreferencesP2WeaponMenu').GetControl('mOptionsPreferencesP2WeaponMenu'));
for i := WP_FIRST to WP_LAST+1 do
begin
Result := TGUISwitch(GetControl('swGameMode')).ItemIndex+1;
gsGameMode := TGUISwitch(GetControl('swGameMode')).GetText;
gsTimeLimit := StrToIntDef(TGUIEdit(GetControl('edTimeLimit')).Text, 0);
- gsGoalLimit := StrToIntDef(TGUIEdit(GetControl('edGoalLimit')).Text, 0);
+ gsScoreLimit := StrToIntDef(TGUIEdit(GetControl('edScoreLimit')).Text, 0);
gsMaxLives := StrToIntDef(TGUIEdit(GetControl('edMaxLives')).Text, 0);
gsItemRespawnTime := StrToIntDef(TGUIEdit(GetControl('edItemRespawnTime')).Text, 0);
gsPlayers := TGUISwitch(GetControl('swPlayers')).ItemIndex;
if GameMode = GM_NONE then Exit;
g_Console_WriteGameConfig;
- g_Game_StartCustom(gsMap, GameMode, gsTimeLimit, gsGoalLimit,
+ g_Game_StartCustom(gsMap, GameMode, gsTimeLimit, gsScoreLimit,
gsMaxLives, gsGameFlags, gsPlayers);
end;
end;
g_Console_WriteGameConfig;
- g_Game_StartServer(gsMap, GameMode, gsTimeLimit, gsGoalLimit, gsMaxLives,
+ g_Game_StartServer(gsMap, GameMode, gsTimeLimit, gsScoreLimit, gsMaxLives,
gsGameFlags, gsPlayers, 0, NetPort);
end;
slWaitStr := _lc[I_NET_SLIST_WAIT];
- g_Game_Draw;
- sys_Repaint;
+ {$IFDEF ENABLE_RENDER}
+ r_Render_Draw;
+ {$ENDIF}
slReturnPressed := True;
if g_Net_Slist_Fetch(slCurrent) then
ProcChangeColor(nil);
end;
-procedure LoadStdFont(cfgres, texture: string; var FontID: DWORD);
-var
- cwdt, chgt: Byte;
- spc: ShortInt;
- ID: DWORD;
- wad: TWADFile;
- cfgdata: Pointer;
- cfglen: Integer;
- config: TConfig;
-begin
- cfglen := 0;
-
- wad := TWADFile.Create;
- if wad.ReadFile(GameWAD) then
- wad.GetResource('FONTS/'+cfgres, cfgdata, cfglen);
- wad.Free();
-
- if cfglen <> 0 then
- begin
- g_Texture_CreateWADEx('FONT_STD', GameWAD+':FONTS\'+texture);
-
- config := TConfig.CreateMem(cfgdata, cfglen);
- cwdt := Min(Max(config.ReadInt('FontMap', 'CharWidth', 0), 0), 255);
- chgt := Min(Max(config.ReadInt('FontMap', 'CharHeight', 0), 0), 255);
- spc := Min(Max(config.ReadInt('FontMap', 'Kerning', 0), -128), 127);
-
- if g_Texture_Get('FONT_STD', ID) then
- e_TextureFontBuild(ID, FontID, cwdt, chgt, spc);
-
- config.Free();
- end;
-
- if cfglen <> 0 then FreeMem(cfgdata);
-end;
-
-procedure LoadFont(txtres, fntres: string; var FontID: DWORD);
-var
- cwdt, chgt: Byte;
- spc: ShortInt;
- CharID: DWORD;
- wad: TWADFile;
- cfgdata, fntdata: Pointer;
- cfglen, fntlen: Integer;
- config: TConfig;
- chrwidth: Integer;
- a: Byte;
-begin
- cfglen := 0;
- fntlen := 0;
-
- wad := TWADFile.Create;
- if wad.ReadFile(GameWAD) then
- begin
- wad.GetResource('FONTS/'+txtres, cfgdata, cfglen);
- wad.GetResource('FONTS/'+fntres, fntdata, fntlen);
- end;
- wad.Free();
-
- if cfglen <> 0 then
- begin
- config := TConfig.CreateMem(cfgdata, cfglen);
- cwdt := Min(Max(config.ReadInt('FontMap', 'CharWidth', 0), 0), 255);
- chgt := Min(Max(config.ReadInt('FontMap', 'CharHeight', 0), 0), 255);
-
- spc := Min(Max(config.ReadInt('FontMap', 'Kerning', 0), -128), 127);
- FontID := e_CharFont_Create(spc);
-
- for a := 0 to 255 do
- begin
- chrwidth := config.ReadInt(IntToStr(a), 'Width', 0);
- if chrwidth = 0 then Continue;
-
- if e_CreateTextureMemEx(fntdata, fntlen, CharID, cwdt*(a mod 16), chgt*(a div 16),
- cwdt, chgt) then
- e_CharFont_AddChar(FontID, CharID, Chr(a), chrwidth);
- end;
-
- config.Free();
- end;
-
- if cfglen <> 0 then FreeMem(cfgdata);
- if fntlen <> 0 then FreeMem(fntdata);
-end;
-
procedure MenuLoadData();
begin
e_WriteLog('Loading menu data...', TMsgType.Notify);
- g_Texture_CreateWADEx('MAINMENU_LOGO', GameWAD+':TEXTURES\MAINLOGO');
- g_Texture_CreateWADEx('MAINMENU_MARKER1', GameWAD+':TEXTURES\MARKER1');
- g_Texture_CreateWADEx('MAINMENU_MARKER2', GameWAD+':TEXTURES\MARKER2');
- g_Texture_CreateWADEx('SCROLL_LEFT', GameWAD+':TEXTURES\SLEFT');
- g_Texture_CreateWADEx('SCROLL_RIGHT', GameWAD+':TEXTURES\SRIGHT');
- g_Texture_CreateWADEx('SCROLL_MIDDLE', GameWAD+':TEXTURES\SMIDDLE');
- g_Texture_CreateWADEx('SCROLL_MARKER', GameWAD+':TEXTURES\SMARKER');
- g_Texture_CreateWADEx('EDIT_LEFT', GameWAD+':TEXTURES\ELEFT');
- g_Texture_CreateWADEx('EDIT_RIGHT', GameWAD+':TEXTURES\ERIGHT');
- g_Texture_CreateWADEx('EDIT_MIDDLE', GameWAD+':TEXTURES\EMIDDLE');
- g_Texture_CreateWADEx('BOX1', GameWAD+':TEXTURES\BOX1');
- g_Texture_CreateWADEx('BOX2', GameWAD+':TEXTURES\BOX2');
- g_Texture_CreateWADEx('BOX3', GameWAD+':TEXTURES\BOX3');
- g_Texture_CreateWADEx('BOX4', GameWAD+':TEXTURES\BOX4');
- g_Texture_CreateWADEx('BOX5', GameWAD+':TEXTURES\BOX5');
- g_Texture_CreateWADEx('BOX6', GameWAD+':TEXTURES\BOX6');
- g_Texture_CreateWADEx('BOX7', GameWAD+':TEXTURES\BOX7');
- g_Texture_CreateWADEx('BOX8', GameWAD+':TEXTURES\BOX8');
- g_Texture_CreateWADEx('BOX9', GameWAD+':TEXTURES\BOX9');
- g_Texture_CreateWADEx('BSCROLL_UP_A', GameWAD+':TEXTURES\SCROLLUPA');
- g_Texture_CreateWADEx('BSCROLL_UP_U', GameWAD+':TEXTURES\SCROLLUPU');
- g_Texture_CreateWADEx('BSCROLL_DOWN_A', GameWAD+':TEXTURES\SCROLLDOWNA');
- g_Texture_CreateWADEx('BSCROLL_DOWN_U', GameWAD+':TEXTURES\SCROLLDOWNU');
- g_Texture_CreateWADEx('BSCROLL_MIDDLE', GameWAD+':TEXTURES\SCROLLMIDDLE');
- g_Texture_CreateWADEx('NOPIC', GameWAD+':TEXTURES\NOPIC');
-
g_Sound_CreateWADEx('MENU_SELECT', GameWAD+':SOUNDS\MENUSELECT');
g_Sound_CreateWADEx('MENU_OPEN', GameWAD+':SOUNDS\MENUOPEN');
g_Sound_CreateWADEx('MENU_CLOSE', GameWAD+':SOUNDS\MENUCLOSE');
procedure MenuFreeData();
begin
- e_CharFont_Remove(gMenuFont);
- e_CharFont_Remove(gMenuSmallFont);
-
- g_Texture_Delete('MAINMENU_LOGO');
- g_Texture_Delete('MAINMENU_MARKER1');
- g_Texture_Delete('MAINMENU_MARKER2');
- g_Texture_Delete('SCROLL_LEFT');
- g_Texture_Delete('SCROLL_RIGHT');
- g_Texture_Delete('SCROLL_MIDDLE');
- g_Texture_Delete('SCROLL_MARKER');
- g_Texture_Delete('EDIT_LEFT');
- g_Texture_Delete('EDIT_RIGHT');
- g_Texture_Delete('EDIT_MIDDLE');
- g_Texture_Delete('BOX1');
- g_Texture_Delete('BOX2');
- g_Texture_Delete('BOX3');
- g_Texture_Delete('BOX4');
- g_Texture_Delete('BOX5');
- g_Texture_Delete('BOX6');
- g_Texture_Delete('BOX7');
- g_Texture_Delete('BOX8');
- g_Texture_Delete('BOX9');
- g_Texture_Delete('BSCROLL_UP_A');
- g_Texture_Delete('BSCROLL_UP_U');
- g_Texture_Delete('BSCROLL_DOWN_A');
- g_Texture_Delete('BSCROLL_DOWN_U');
- g_Texture_Delete('BSCROLL_MIDDLE');
- g_Texture_Delete('NOPIC');
-
g_Sound_Delete('MENU_SELECT');
g_Sound_Delete('MENU_OPEN');
g_Sound_Delete('MENU_CLOSE');
procedure ProcOptionsPlayersMIMenu();
var
s, a: string;
- b: TModelInfo;
+ i: Integer;
begin
if g_ActiveWindow.Name = 'OptionsPlayersP1Menu' then s := 'P1' else s := 'P2';
if a = '' then Exit;
- b := g_PlayerModel_GetInfo(a);
-
+ i := g_PlayerModel_GetIndex(a);
with TGUIMenu(g_GUI_GetWindow('OptionsPlayersMIMenu').GetControl('mOptionsPlayersMIMenu')) do
begin
- TGUILabel(GetControl('lbName')).Text := b.Name;
- TGUILabel(GetControl('lbAuthor')).Text := b.Author;
- TGUIMemo(GetControl('meComment')).SetText(b.Description);
+ TGUILabel(GetControl('lbName')).Text := PlayerModelsArray[i].Name;
+ TGUILabel(GetControl('lbAuthor')).Text := PlayerModelsArray[i].Author;
+ TGUIMemo(GetControl('meComment')).SetText(PlayerModelsArray[i].Description);
- if b.HaveWeapon then
+ if PlayerModelsArray[i].HaveWeapon then
TGUILabel(GetControl('lbWeapon')).Text := _lc[I_MENU_YES]
else
TGUILabel(GetControl('lbWeapon')).Text := _lc[I_MENU_NO];
with TGUIModelView(g_ActiveWindow.GetControl('mv'+s+'Model')) do
begin
NextAnim();
- Model.GetCurrentAnimation.Loop := True;
- Model.GetCurrentAnimationMask.Loop := True;
+ Model.AnimState.Loop := True;
end;
end;
ItemIndex := 2;
TGUIEdit(menu.GetControl('edTimeLimit')).Text := IntToStr(TimeLimit);
- TGUIEdit(menu.GetControl('edGoalLimit')).Text := IntToStr(GoalLimit);
+ TGUIEdit(menu.GetControl('edScoreLimit')).Text := IntToStr(ScoreLimit);
TGUIEdit(menu.GetControl('edMaxLives')).Text := IntToStr(MaxLives);
with TGUISwitch(menu.GetControl('swBotsVS')) do
end;
TGUIEdit(menu.GetControl('edTimeLimit')).Enabled := True;
TGUILabel(menu.GetControlsText('edTimeLimit')).Color := MENU_ITEMSTEXT_COLOR;
- TGUIEdit(menu.GetControl('edGoalLimit')).Enabled := True;
- TGUILabel(menu.GetControlsText('edGoalLimit')).Color := MENU_ITEMSTEXT_COLOR;
+ TGUIEdit(menu.GetControl('edScoreLimit')).Enabled := True;
+ TGUILabel(menu.GetControlsText('edScoreLimit')).Color := MENU_ITEMSTEXT_COLOR;
TGUIEdit(menu.GetControl('edMaxLives')).Enabled := True;
TGUILabel(menu.GetControlsText('edMaxLives')).Color := MENU_ITEMSTEXT_COLOR;
TGUISwitch(menu.GetControl('swBotsVS')).Enabled := True;
Text := '';
end;
TGUILabel(menu.GetControlsText('edTimeLimit')).Color := MENU_UNACTIVEITEMS_COLOR;
- with TGUIEdit(menu.GetControl('edGoalLimit')) do
+ with TGUIEdit(menu.GetControl('edScoreLimit')) do
begin
Enabled := False;
Text := '';
end;
- TGUILabel(menu.GetControlsText('edGoalLimit')).Color := MENU_UNACTIVEITEMS_COLOR;
+ TGUILabel(menu.GetControlsText('edScoreLimit')).Color := MENU_UNACTIVEITEMS_COLOR;
with TGUIEdit(menu.GetControl('edMaxLives')) do
begin
Enabled := False;
end;
end;
- if TGUIEdit(menu.GetControl('edGoalLimit')).Enabled then
+ if TGUIEdit(menu.GetControl('edScoreLimit')).Enabled then
begin
- n := StrToIntDef(TGUIEdit(menu.GetControl('edGoalLimit')).Text, GoalLimit);
+ n := StrToIntDef(TGUIEdit(menu.GetControl('edScoreLimit')).Text, ScoreLimit);
if n = 0 then
- GoalLimit := 0
+ ScoreLimit := 0
else
begin
b := 0;
b := stat[a].Frags;
end
else // CTF
- b := Max(gTeamStat[TEAM_RED].Goals, gTeamStat[TEAM_BLUE].Goals);
+ b := Max(gTeamStat[TEAM_RED].Score, gTeamStat[TEAM_BLUE].Score);
- GoalLimit := Max(n, b);
+ ScoreLimit := Max(n, b);
end;
end;
if TGUIEdit(menu.GetControl('edMaxLives')).Enabled then
begin
- n := StrToIntDef(TGUIEdit(menu.GetControl('edMaxLives')).Text, GoalLimit);
+ n := StrToIntDef(TGUIEdit(menu.GetControl('edMaxLives')).Text, MaxLives);
if n < 0 then n := 0;
if n > 255 then n := 255;
if n = 0 then
// don't forget to latch this shit
gsGameFlags := Options;
gsMaxLives := MaxLives;
- gsGoalLimit := GoalLimit;
+ gsScoreLimit := ScoreLimit;
gsTimeLimit := TimeLimit;
end;
with TGUIListBox(menu.GetControl('lsResolution')) do
begin
- list := sys_GetDisplayModes(gBPP);
+ {$IFDEF ENABLE_SYSTEM}
+ list := sys_GetDisplayModes(gBPP);
+ {$ELSE}
+ list := nil;
+ {$ENDIF}
if list <> nil then
begin
Items := list;
begin
Menu := TGUIWindow.Create('FirstLanguageMenu');
- with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, '', ' '))) do
+ with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(True, ' '))) do // space to prevent show logo
begin
Name := 'mmFirstLanguageMenu';
AddButton(@ProcSetFirstRussianLanguage, 'Ðóññêèé', '');
a := _lc[I_MENU_PLAYER_1]
else
a := _lc[I_MENU_PLAYER_2];
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, a))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(True, False, a))) do
begin
Name := 'mOptionsPlayers'+s+'Menu';
with AddEdit(_lc[I_MENU_PLAYER_NAME]) do
var
Menu: TGUIWindow;
//SR: TSearchRec;
- a, cx, _y, i, x: Integer;
+ a, cx, _y, i: Integer;
//list: SSArray;
begin
Menu := TGUIWindow.Create('MainMenu');
- with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, 'MAINMENU_LOGO', _lc[I_MENU_MAIN_MENU]))) do
+ with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(True, '' (*_lc[I_MENU_MAIN_MENU]*) ))) do
begin
Name := 'mmMainMenu';
AddButton(nil, _lc[I_MENU_NEW_GAME], 'NewGameMenu');
AddButton(@ProcAuthorsMenu, _lc[I_MENU_AUTHORS], 'AuthorsMenu');
AddButton(nil, _lc[I_MENU_EXIT], 'ExitMenu');
end;
- with TGUILabel(Menu.AddChild(TGUILabel.Create(Format(_lc[I_VERSION], [GAME_VERSION]), gMenuSmallFont))) do
+ with TGUILabel(Menu.AddChild(TGUILabel.Create(Format(_lc[I_VERSION], [GAME_VERSION]), False))) do
begin
Color := _RGB(255, 255, 255);
X := gScreenWidth-GetWidth-8;
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('NewGameMenu');
- with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, '', _lc[I_MENU_NEW_GAME]))) do
+ with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(True, _lc[I_MENU_NEW_GAME]))) do
begin
Name := 'mmNewGameMenu';
AddButton(@ProcSingle1Player, _lc[I_MENU_1_PLAYER]);
AddButton(@ProcSingle2Players, _lc[I_MENU_2_PLAYERS]);
- AddButton(nil, _lc[I_MENU_CUSTOM_GAME], 'CustomGameMenu');
AddButton(@ProcSelectCampaignMenu, _lc[I_MENU_CAMPAIGN], 'CampaignMenu');
+ AddButton(nil, _lc[I_MENU_CUSTOM_GAME], 'CustomGameMenu');
end;
Menu.DefControl := 'mmNewGameMenu';
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('NetGameMenu');
- with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, '', _lc[I_MENU_MULTIPLAYER]))) do
+ with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(True, _lc[I_MENU_MULTIPLAYER]))) do
begin
Name := 'mmNetGameMenu';
AddButton(@ProcRecallAddress, _lc[I_MENU_START_CLIENT], 'NetClientMenu');
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('NetServerMenu');
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_START_SERVER]))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(True, False, _lc[I_MENU_START_SERVER]))) do
begin
Name := 'mNetServerMenu';
with AddEdit(_lc[I_NET_SERVER_NAME]) do
if gsTimeLimit > 0 then
Text := IntToStr(gsTimeLimit);
end;
- with AddEdit(_lc[I_MENU_GOAL_LIMIT]) do
+ with AddEdit(_lc[I_MENU_SCORE_LIMIT]) do
begin
- Name := 'edGoalLimit';
+ Name := 'edScoreLimit';
OnlyDigits := True;
Width := 4;
MaxLength := 5;
- if gsGoalLimit > 0 then
- Text := IntToStr(gsGoalLimit);
+ if gsScoreLimit > 0 then
+ Text := IntToStr(gsScoreLimit);
end;
with AddEdit(_lc[I_MENU_MAX_LIVES]) do
begin
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('NetClientMenu');
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_START_CLIENT]))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(True, False, _lc[I_MENU_START_CLIENT]))) do
begin
Name := 'mNetClientMenu';
Menu := TGUIWindow.Create('LoadMenu');
Menu.OnShow := ProcLoadMenu;
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_LOAD_GAME]))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(True, False, _lc[I_MENU_LOAD_GAME]))) do
begin
Name := 'mmLoadMenu';
Menu := TGUIWindow.Create('SaveMenu');
Menu.OnShow := ProcSaveMenu;
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_SAVE_GAME]))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(True, False, _lc[I_MENU_SAVE_GAME]))) do
begin
Name := 'mmSaveMenu';
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('CustomGameMenu');
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_CUSTOM_GAME]))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(True, False, _lc[I_MENU_CUSTOM_GAME]))) do
begin
Name := 'mCustomGameMenu';
with AddLabel(_lc[I_MENU_MAP]) do
if gsTimeLimit > 0 then
Text := IntToStr(gsTimeLimit);
end;
- with AddEdit(_lc[I_MENU_GOAL_LIMIT]) do
+ with AddEdit(_lc[I_MENU_SCORE_LIMIT]) do
begin
- Name := 'edGoalLimit';
+ Name := 'edScoreLimit';
OnlyDigits := True;
Width := 4;
MaxLength := 5;
- if gsGoalLimit > 0 then
- Text := IntToStr(gsGoalLimit);
+ if gsScoreLimit > 0 then
+ Text := IntToStr(gsScoreLimit);
end;
with AddEdit(_lc[I_MENU_MAX_LIVES]) do
begin
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('CampaignMenu');
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_CAMPAIGN]))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(True, False, _lc[I_MENU_CAMPAIGN]))) do
begin
Name := 'mCampaignMenu';
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('SelectMapMenu');
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_SELECT_MAP]))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(True, False, _lc[I_MENU_SELECT_MAP]))) do
begin
Name := 'mSelectMapMenu';
with AddFileList(_lc[I_MENU_MAP_WAD], 12, 4) do
FixedLength := 10;
Enabled := False;
end;
- with AddMemo(_lc[I_MENU_MAP_DESCRIPTION], 12, 4) do
+ with AddMemo(_lc[I_MENU_MAP_DESCRIPTION], 20, 4) do
begin
Name := 'meMapDescription';
end;
X := GetControl('lsMapWAD').X+TGUIListBox(GetControl('lsMapWAD')).GetWidth()+2;
Y := GetControl('lsMapWAD').Y;
end;
- with TGUILabel(Menu.AddChild(TGUILabel.Create('', gMenuSmallFont))) do
+ with TGUILabel(Menu.AddChild(TGUILabel.Create('', False))) do
begin
Name := 'lbMapScale';
FixedLength := 8;
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('OptionsMenu');
- with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, '', _lc[I_MENU_OPTIONS]))) do
+ with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(True, _lc[I_MENU_OPTIONS]))) do
begin
Name := 'mmOptionsMenu';
AddButton(nil, _lc[I_MENU_VIDEO_OPTIONS], 'OptionsVideoMenu');
Menu.DefControl := 'mmOptionsMenu';
g_GUI_AddWindow(Menu);
- Menu := CreateYNMenu('SavedOptionsMenu', _lc[I_MENU_LOAD_SAVED_PROMT], Round(gScreenWidth*0.6),
- gMenuSmallFont, @ProcSavedMenuKeyDown);
+ Menu := CreateYNMenu('SavedOptionsMenu', _lc[I_MENU_LOAD_SAVED_PROMT], Round(gScreenWidth*0.6), @ProcSavedMenuKeyDown);
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('OptionsVideoMenu');
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_VIDEO_OPTIONS]))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(True, False, _lc[I_MENU_VIDEO_OPTIONS]))) do
begin
Name := 'mOptionsVideoMenu';
AddButton(@ProcVideoOptionsRes, _lc[I_MENU_VIDEO_RESOLUTION], 'OptionsVideoResMenu');
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('OptionsVideoResMenu');
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_RESOLUTION_SELECT]))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(True, False, _lc[I_MENU_RESOLUTION_SELECT]))) do
begin
Name := 'mOptionsVideoResMenu';
with AddLabel(_lc[I_MENU_RESOLUTION_CURRENT]) do
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('OptionsSoundMenu');
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_SOUND_OPTIONS]))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(True, False, _lc[I_MENU_SOUND_OPTIONS]))) do
begin
Name := 'mOptionsSoundMenu';
with AddScroll(_lc[I_MENU_SOUND_MUSIC_LEVEL]) do
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('OptionsGameMenu');
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_GAME_OPTIONS]))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(True, False, _lc[I_MENU_GAME_OPTIONS]))) do
begin
Name := 'mOptionsGameMenu';
with AddScroll(_lc[I_MENU_GAME_PARTICLES_COUNT]) do
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('OptionsControlsMenu');
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_CONTROLS_OPTIONS]))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(True, False, _lc[I_MENU_CONTROLS_OPTIONS]))) do
begin
Name := 'mOptionsControlsMenu';
AddLine(_lc[I_MENU_CONTROL_GLOBAL]);
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('OptionsControlsP1Menu');
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_PLAYER_1_KBD]))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(True, False, _lc[I_MENU_PLAYER_1_KBD]))) do
begin
Name := 'mOptionsControlsP1Menu';
AddKeyRead2(_lc[I_MENU_CONTROL_LEFT]).Name := _lc[I_MENU_CONTROL_LEFT];
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('OptionsControlsP1MenuWeapons');
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_PLAYER_1_WEAPONS]))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(True, False, _lc[I_MENU_PLAYER_1_WEAPONS]))) do
begin
Name := 'mOptionsControlsP1MenuWeapons';
for i := WP_FIRST to WP_LAST do
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('OptionsControlsP2Menu');
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_PLAYER_2_KBD]))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(True, False, _lc[I_MENU_PLAYER_2_KBD]))) do
begin
Name := 'mOptionsControlsP2Menu';
AddKeyRead2(_lc[I_MENU_CONTROL_LEFT]).Name := _lc[I_MENU_CONTROL_LEFT];
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('OptionsControlsP2MenuWeapons');
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_PLAYER_2_WEAPONS]))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(True, False, _lc[I_MENU_PLAYER_2_WEAPONS]))) do
begin
Name := 'mOptionsControlsP2MenuWeapons';
for i := WP_FIRST to WP_LAST do
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('OptionsControlsJoystickMenu');
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_CONTROL_JOYSTICKS]))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(True, False, _lc[I_MENU_CONTROL_JOYSTICKS]))) do
begin
Name := 'mOptionsControlsJoystickMenu';
for i := 0 to e_MaxJoys - 1 do
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('OptionsControlsTouchMenu');
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_CONTROL_TOUCH]))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(True, False, _lc[I_MENU_CONTROL_TOUCH]))) do
begin
Name := 'mOptionsControlsTouchMenu';
with AddSwitch(_lc[I_MENU_CONTROL_TOUCH_ALT]) do
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('OptionsPlayersMenu');
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_PLAYER_OPTIONS]))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(True, False, _lc[I_MENU_PLAYER_OPTIONS]))) do
begin
Name := 'mOptionsPlayersMenu';
AddButton(nil, _lc[I_MENU_PLAYER_1], 'OptionsPlayersP1Menu');
CreatePlayerOptionsMenu('P2');
Menu := TGUIWindow.Create('OptionsPlayersMIMenu');
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_MODEL_INFO]))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(True, False, _lc[I_MENU_MODEL_INFO]))) do
begin
Name := 'mOptionsPlayersMIMenu';
with AddLabel(_lc[I_MENU_MODEL_NAME]) do
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('OptionsPlayersP1WeaponMenu');
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_WEAPON]))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(True, False, _lc[I_MENU_WEAPON]))) do
begin
Name := 'mOptionsPlayersP1WeaponMenu';
with AddSwitch(_lc[I_MENU_WEAPON_SWITCH]) do
AddItem(_lc[I_MENU_WEAPON_SWITCH_LINEAR]);
AddItem(_lc[I_MENU_WEAPON_SWITCH_PREFERENCE]);
end;
+ with AddSwitch(_lc[I_MENU_WEAPON_ALLOW_EMPTY]) do
+ begin
+ Name := 'swWeaponAllowEmpty';
+ AddItem(_lc[I_MENU_YES]);
+ AddItem(_lc[I_MENU_NO]);
+ end;
+ with AddSwitch(_lc[I_MENU_KASTET_ALLOW]) do
+ begin
+ Name := 'swWeaponAllowFist';
+ AddItem(_lc[I_MENU_KASTET_ALLOW_ALWAYS]);
+ AddItem(_lc[I_MENU_KASTET_ALLOW_BERSERK]);
+ end;
AddButton(@ProcOptionsPlayerP1WeaponPreferencesMenu, _lc[I_MENU_WEAPON_SWITCH_PRIORITY]);
ReAlign();
end;
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('OptionsPreferencesP1WeaponMenu');
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_WEAPON_PRIORITY_PLAYER_1]))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(True, False, _lc[I_MENU_WEAPON_PRIORITY_PLAYER_1]))) do
begin
Name := 'mOptionsPreferencesP1WeaponMenu';
for i := WP_FIRST to WP_LAST do
Menu := TGUIWindow.Create('OptionsPlayersP2WeaponMenu');
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_WEAPON]))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(True, False, _lc[I_MENU_WEAPON]))) do
begin
Name := 'mOptionsPlayersP2WeaponMenu';
with AddSwitch(_lc[I_MENU_WEAPON_SWITCH]) do
AddItem(_lc[I_MENU_WEAPON_SWITCH_LINEAR]);
AddItem(_lc[I_MENU_WEAPON_SWITCH_PREFERENCE]);
end;
+ with AddSwitch(_lc[I_MENU_WEAPON_ALLOW_EMPTY]) do
+ begin
+ Name := 'swWeaponAllowEmpty';
+ AddItem(_lc[I_MENU_YES]);
+ AddItem(_lc[I_MENU_NO]);
+ end;
+ with AddSwitch(_lc[I_MENU_KASTET_ALLOW]) do
+ begin
+ Name := 'swWeaponAllowFist';
+ AddItem(_lc[I_MENU_KASTET_ALLOW_ALWAYS]);
+ AddItem(_lc[I_MENU_KASTET_ALLOW_BERSERK]);
+ end;
AddButton(@ProcOptionsPlayerP2WeaponPreferencesMenu, _lc[I_MENU_WEAPON_SWITCH_PRIORITY]);
ReAlign();
end;
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('OptionsPreferencesP2WeaponMenu');
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_WEAPON_PRIORITY_PLAYER_2]))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(True, False, _lc[I_MENU_WEAPON_PRIORITY_PLAYER_2]))) do
begin
Name := 'mOptionsPreferencesP2WeaponMenu';
for i := WP_FIRST to WP_LAST do
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('OptionsLanguageMenu');
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_LANGUAGE_OPTIONS]))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(True, False, _lc[I_MENU_LANGUAGE_OPTIONS]))) do
begin
Name := 'mOptionsLanguageMenu';
AddButton(@ProcSetRussianLanguage, _lc[I_MENU_LANGUAGE_RUSSIAN]);
Menu.DefControl := 'mOptionsLanguageMenu';
g_GUI_AddWindow(Menu);
- Menu := CreateYNMenu('DefaultOptionsMenu', _lc[I_MENU_SET_DEFAULT_PROMT], Round(gScreenWidth*0.6),
- gMenuSmallFont, @ProcDefaultMenuKeyDown);
+ Menu := CreateYNMenu('DefaultOptionsMenu', _lc[I_MENU_SET_DEFAULT_PROMT], Round(gScreenWidth*0.6), @ProcDefaultMenuKeyDown);
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('AuthorsMenu');
- Menu.BackTexture := 'INTER';
+ Menu.BackTexture := GameWad + ':/TEXTURES/INTER';
Menu.OnClose := ProcAuthorsClose;
// Çàãîëîâîê:
_y := 16;
- with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_CAP_1], gMenuFont))) do
+ with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_CAP_1], False))) do
begin
Color := _RGB(255, 0, 0);
X := (gScreenWidth div 2)-(GetWidth() div 2);
Y := _y;
_y := _y+GetHeight();
end;
- with TGUILabel(Menu.AddChild(TGUILabel.Create(Format(_lc[I_CREDITS_CAP_2], [GAME_VERSION, NET_PROTOCOL_VER]), gMenuSmallFont))) do
+ with TGUILabel(Menu.AddChild(TGUILabel.Create(Format(_lc[I_CREDITS_CAP_2], [GAME_VERSION, NET_PROTOCOL_VER]), False))) do
begin
Color := _RGB(255, 0, 0);
X := (gScreenWidth div 2)-(GetWidth() div 2);
end;
// ×òî äåëàë: Êòî äåëàë
cx := gScreenWidth div 2 - 320 + 64;
- with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_A_1], gMenuSmallFont))) do
+ with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_A_1], False))) do
begin
Color := _RGB(255, 0, 0);
X := cx;
Y := _y;
_y := _y+22;
end;
- with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_A_1_1], gMenuSmallFont))) do
+ with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_A_1_1], False))) do
begin
Color := _RGB(255, 255, 255);
X := cx+32;
Y := _y;
_y := _y+36;
end;
- with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_A_2], gMenuSmallFont))) do
+ with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_A_2], False))) do
begin
Color := _RGB(255, 0, 0);
X := cx;
Y := _y;
_y := _y+22;
end;
- with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_A_2_1], gMenuSmallFont))) do
+ with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_A_2_1], False))) do
begin
Color := _RGB(255, 255, 255);
X := cx+32;
Y := _y;
_y := _y+22;
end;
- with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_A_2_2], gMenuSmallFont))) do
+ with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_A_2_2], False))) do
begin
Color := _RGB(255, 255, 255);
X := cx+32;
Y := _y;
_y := _y+36;
end;
- with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_A_3], gMenuSmallFont))) do
+ with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_A_3], False))) do
begin
Color := _RGB(255, 0, 0);
X := cx;
Y := _y;
_y := _y+22;
end;
- with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_A_3_1], gMenuSmallFont))) do
+ with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_A_3_1], False))) do
begin
Color := _RGB(255, 255, 255);
X := cx+32;
Y := _y;
_y := _y+36;
end;
- with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_A_4], gMenuSmallFont))) do
+ with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_A_4], False))) do
begin
Color := _RGB(255, 0, 0);
X := cx;
Y := _y;
_y := _y+22;
end;
- with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_A_4_1], gMenuSmallFont))) do
+ with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_A_4_1], False))) do
begin
Color := _RGB(255, 255, 255);
X := cx+32;
_y := gScreenHeight - 128;
end;
// Çàêëþ÷åíèå:
- with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_CAP_3], gMenuSmallFont))) do
+ with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_CAP_3], False))) do
begin
Color := _RGB(255, 0, 0);
X := cx;
Y := _y;
_y := _y+16;
end;
- with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_CLO_1], gMenuSmallFont))) do
+ with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_CLO_1], False))) do
begin
Color := _RGB(255, 255, 255);
X := cx+32;
Y := _y;
_y := _y+GetHeight();
end;
- with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_CLO_2], gMenuSmallFont))) do
+ with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_CLO_2], False))) do
begin
Color := _RGB(255, 255, 255);
X := cx+32;
Y := _y;
_y := _y+GetHeight();
end;
- with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_CLO_3], gMenuSmallFont))) do
+ with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_CLO_3], False))) do
begin
Color := _RGB(255, 255, 255);
X := cx+32;
Y := _y;
_y := gScreenHeight - 32;
end;
- with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_CLO_4], gMenuSmallFont))) do
+ with TGUILabel(Menu.AddChild(TGUILabel.Create(_lc[I_CREDITS_CLO_4], False))) do
begin
Color := _RGB(255, 0, 0);
X := gScreenWidth div 2 - GetWidth() div 2;
end;
g_GUI_AddWindow(Menu);
- Menu := CreateYNMenu('ExitMenu', _lc[I_MENU_EXIT_PROMT], Round(gScreenWidth*0.6),
- gMenuSmallFont, @ProcExitMenuKeyDown);
+ Menu := CreateYNMenu('ExitMenu', _lc[I_MENU_EXIT_PROMT], Round(gScreenWidth*0.6), @ProcExitMenuKeyDown);
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('GameSingleMenu');
- with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, '', _lc[I_MENU_MAIN_MENU]))) do
+ with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(True, _lc[I_MENU_MAIN_MENU]))) do
begin
Name := 'mmGameSingleMenu';
AddButton(nil, _lc[I_MENU_LOAD_GAME], 'LoadMenu');
Menu.OnShow := ProcGMShow;
g_GUI_AddWindow(Menu);
- Menu := CreateYNMenu('EndGameMenu', _lc[I_MENU_END_GAME_PROMT], Round(gScreenWidth*0.6),
- gMenuSmallFont, @ProcEndMenuKeyDown);
+ Menu := CreateYNMenu('EndGameMenu', _lc[I_MENU_END_GAME_PROMT], Round(gScreenWidth*0.6), @ProcEndMenuKeyDown);
g_GUI_AddWindow(Menu);
- Menu := CreateYNMenu('RestartGameMenu', _lc[I_MENU_RESTART_GAME_PROMT], Round(gScreenWidth*0.6),
- gMenuSmallFont, @ProcRestartMenuKeyDown);
+ Menu := CreateYNMenu('RestartGameMenu', _lc[I_MENU_RESTART_GAME_PROMT], Round(gScreenWidth*0.6), @ProcRestartMenuKeyDown);
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('GameCustomMenu');
- with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, '', _lc[I_MENU_MAIN_MENU]))) do
+ with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(True, _lc[I_MENU_MAIN_MENU]))) do
begin
Name := 'mmGameCustomMenu';
AddButton(nil, _lc[I_MENU_CHANGE_PLAYERS], 'TeamMenu');
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('GameServerMenu');
- with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, '', _lc[I_MENU_MAIN_MENU]))) do
+ with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(True, _lc[I_MENU_MAIN_MENU]))) do
begin
Name := 'mmGameServerMenu';
AddButton(nil, _lc[I_MENU_CHANGE_PLAYERS], 'TeamMenu');
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('GameClientMenu');
- with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, '', _lc[I_MENU_MAIN_MENU]))) do
+ with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(True, _lc[I_MENU_MAIN_MENU]))) do
begin
Name := 'mmGameClientMenu';
AddButton(nil, _lc[I_MENU_CHANGE_PLAYERS], 'TeamMenu');
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('ClientPasswordMenu');
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuSmallFont, gMenuSmallFont, _lc[I_MENU_ENTERPASSWORD]))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(False, False, _lc[I_MENU_ENTERPASSWORD]))) do
begin
Name := 'mClientPasswordMenu';
with AddEdit(_lc[I_NET_SERVER_PASSWORD]) do
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('GameSetGameMenu');
- with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_SET_GAME]))) do
+ with TGUIMenu(Menu.AddChild(TGUIMenu.Create(True, False, _lc[I_MENU_SET_GAME]))) do
begin
Name := 'mGameSetGameMenu';
with AddSwitch(_lc[I_MENU_TEAM_DAMAGE]) do
Width := 4;
MaxLength := 5;
end;
- with AddEdit(_lc[I_MENU_GOAL_LIMIT]) do
+ with AddEdit(_lc[I_MENU_SCORE_LIMIT]) do
begin
- Name := 'edGoalLimit';
+ Name := 'edScoreLimit';
OnlyDigits := True;
Width := 4;
MaxLength := 5;
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('TeamMenu');
- with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, '', _lc[I_MENU_CHANGE_PLAYERS]))) do
+ with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(True, _lc[I_MENU_CHANGE_PLAYERS]))) do
begin
Name := 'mmTeamMenu';
AddButton(@ProcJoinRed, _lc[I_MENU_JOIN_RED], '').Name := 'tmJoinRed';
procedure g_Menu_Init();
begin
MenuLoadData();
- g_GUI_Init();
CreateAllMenus();
end;
procedure g_Menu_Free();
begin
- g_GUI_Destroy();
-
- e_WriteLog('Releasing menu data...', TMsgType.Notify);
-
MenuFreeData();
end;