diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index 4d2da495216be1983b5f6e38ae4454fc3f7dc6a0..f80e7cbf548f5b3619362c616c72ce8424ec6d41 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 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_AskLanguage();
procedure g_Menu_Show_SaveMenu();
procedure g_Menu_Show_QuitGameMenu();
var
procedure g_Menu_Show_QuitGameMenu();
var
- gMenuFont: DWORD;
- gMenuSmallFont: DWORD;
PromptIP: string;
PromptPort: Word;
TempScale: Integer = -1;
PromptIP: string;
PromptPort: Word;
TempScale: Integer = -1;
+ TempResScale: Integer = -1;
implementation
uses
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,
- e_log, SysUtils, CONFIG, g_playermodel, DateUtils, sdl2,
+ {$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, r_game,
+ {$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,
MAPDEF, Math, g_saveload,
- e_texture, g_language,
- g_net, g_netmsg, g_netmaster, g_items, e_input, g_touch,
+ g_language, e_res,
+ g_net, g_netmsg, g_netmaster, g_items, e_input,
utils, wadreader;
utils, wadreader;
var
menu: TGUIMenu;
i: Integer;
var
menu: TGUIMenu;
i: Integer;
- ovs: Boolean;
begin
menu := TGUIMenu(g_GUI_GetWindow('OptionsVideoMenu').GetControl('mOptionsVideoMenu'));
begin
menu := TGUIMenu(g_GUI_GetWindow('OptionsVideoMenu').GetControl('mOptionsVideoMenu'));
else
gBPP := 32;
else
gBPP := 32;
- ovs := gVSync;
gVSync := TGUISwitch(menu.GetControl('swVSync')).ItemIndex = 0;
gVSync := TGUISwitch(menu.GetControl('swVSync')).ItemIndex = 0;
- if (ovs <> gVSync) then g_SetVSync(gVSync);
gTextureFilter := TGUISwitch(menu.GetControl('swTextureFilter')).ItemIndex = 0;
gTextureFilter := TGUISwitch(menu.GetControl('swTextureFilter')).ItemIndex = 0;
- glLegacyNPOT := not (TGUISwitch(menu.GetControl('swLegacyNPOT')).ItemIndex = 0);
+ glNPOTOverride := not (TGUISwitch(menu.GetControl('swLegacyNPOT')).ItemIndex = 0);
+ gLerpActors := TGUISwitch(menu.GetControl('swInterp')).ItemIndex = 0;
menu := TGUIMenu(g_GUI_GetWindow('OptionsSoundMenu').GetControl('mOptionsSoundMenu'));
menu := TGUIMenu(g_GUI_GetWindow('OptionsSoundMenu').GetControl('mOptionsSoundMenu'));
menu := TGUIMenu(g_GUI_GetWindow('OptionsGameMenu').GetControl('mOptionsGameMenu'));
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;
gBloodCount := TGUISwitch(menu.GetControl('swBloodCount')).ItemIndex;
gFlash := TGUISwitch(menu.GetControl('swScreenFlash')).ItemIndex;
with TGUIModelView(g_GUI_GetWindow('OptionsPlayersP1Menu').GetControl('mvP1Model')) do
begin
with TGUIModelView(g_GUI_GetWindow('OptionsPlayersP1Menu').GetControl('mvP1Model')) do
begin
- gPlayer1Settings.Model := Model.Name;
+ gPlayer1Settings.Model := Model.GetName();
gPlayer1Settings.Color := Model.Color;
end;
gPlayer1Settings.Color := Model.Color;
end;
TEAM_RED, TEAM_BLUE);
with TGUIModelView(g_GUI_GetWindow('OptionsPlayersP2Menu').GetControl('mvP2Model')) do
begin
TEAM_RED, TEAM_BLUE);
with TGUIModelView(g_GUI_GetWindow('OptionsPlayersP2Menu').GetControl('mvP2Model')) do
begin
- gPlayer2Settings.Model := Model.Name;
+ gPlayer2Settings.Model := Model.GetName();
gPlayer2Settings.Color := Model.Color;
end;
gPlayer2Settings.Color := Model.Color;
end;
if g_Game_IsClient then MC_SEND_PlayerSettings;
if g_Game_IsClient then MC_SEND_PlayerSettings;
- g_Options_Write(GameDir+'/'+CONFIG_FILENAME);
- g_Console_WriteGameConfig();
+ g_Console_WriteGameConfig;
end;
procedure ReadOptions();
end;
procedure ReadOptions();
if gVSync then ItemIndex := 0 else ItemIndex := 1;
with TGUISwitch(menu.GetControl('swLegacyNPOT')) do
if gVSync then ItemIndex := 0 else ItemIndex := 1;
with TGUISwitch(menu.GetControl('swLegacyNPOT')) do
- if not glLegacyNPOT then ItemIndex := 0 else ItemIndex := 1;
+ if not glNPOTOverride then ItemIndex := 0 else ItemIndex := 1;
+
+ with TGUISwitch(menu.GetControl('swInterp')) do
+ if gLerpActors then ItemIndex := 0 else ItemIndex := 1;
menu := TGUIMenu(g_GUI_GetWindow('OptionsSoundMenu').GetControl('mOptionsSoundMenu'));
menu := TGUIMenu(g_GUI_GetWindow('OptionsSoundMenu').GetControl('mOptionsSoundMenu'));
menu := TGUIMenu(g_GUI_GetWindow('OptionsGameMenu').GetControl('mOptionsGameMenu'));
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
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('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;
end;
+ {$ENDIF}
with TGUISwitch(menu.GetControl('swBackGround')) do
if gDrawBackGround then ItemIndex := 0 else ItemIndex := 1;
with TGUISwitch(menu.GetControl('swBackGround')) do
if gDrawBackGround then ItemIndex := 0 else ItemIndex := 1;
}
end;
}
end;
-procedure ProcStartCustomGame();
+function LatchGameOptions(const MenuName: string): Byte;
var
var
- Map: String;
- GameMode: Byte;
- Options: LongWord;
+ Map: string;
begin
begin
- with TGUIMenu(g_ActiveWindow.GetControl('mCustomGameMenu')) do
+ Result := GM_NONE;
+
+ with TGUIMenu(g_ActiveWindow.GetControl(MenuName)) do
begin
Map := TGUILabel(GetControl('lbMap')).Text;
if Map = '' then
begin
Map := TGUILabel(GetControl('lbMap')).Text;
if Map = '' then
if not isWadPath(Map) then
Exit;
if not isWadPath(Map) then
Exit;
- GameMode := TGUISwitch(GetControl('swGameMode')).ItemIndex+1;
- gcGameMode := TGUISwitch(GetControl('swGameMode')).GetText;
- gcTimeLimit := StrToIntDef(TGUIEdit(GetControl('edTimeLimit')).Text, 0);
- gcGoalLimit := StrToIntDef(TGUIEdit(GetControl('edGoalLimit')).Text, 0);
- gcMaxLives := StrToIntDef(TGUIEdit(GetControl('edMaxLives')).Text, 0);
-
- gcTeamDamage := TGUISwitch(GetControl('swTeamDamage')).ItemIndex = 0;
- gcAllowExit := TGUISwitch(GetControl('swEnableExits')).ItemIndex = 0;
- gcWeaponStay := TGUISwitch(GetControl('swWeaponStay')).ItemIndex = 0;
- gcMonsters := TGUISwitch(GetControl('swMonsters')).ItemIndex = 0;
- Options := 0;
- if gcTeamDamage then
- Options := Options or GAME_OPTION_TEAMDAMAGE;
- if gcAllowExit then
- Options := Options or GAME_OPTION_ALLOWEXIT;
- if gcWeaponStay then
- Options := Options or GAME_OPTION_WEAPONSTAY;
- if gcMonsters then
- Options := Options or GAME_OPTION_MONSTERS;
- gcPlayers := TGUISwitch(GetControl('swPlayers')).ItemIndex;
+ 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);
+ gsMaxLives := StrToIntDef(TGUIEdit(GetControl('edMaxLives')).Text, 0);
+ gsItemRespawnTime := StrToIntDef(TGUIEdit(GetControl('edItemRespawnTime')).Text, 0);
+ gsPlayers := TGUISwitch(GetControl('swPlayers')).ItemIndex;
+ gsMap := Map;
+
+ gsGameFlags := 0;
+ if TGUISwitch(GetControl('swTeamDamage')).ItemIndex = 0 then
+ gsGameFlags := gsGameFlags or GAME_OPTION_TEAMDAMAGE;
+ if TGUISwitch(GetControl('swDeathmatchKeys')).ItemIndex = 0 then
+ gsGameFlags := gsGameFlags or GAME_OPTION_DMKEYS;
+ if TGUISwitch(GetControl('swEnableExits')).ItemIndex = 0 then
+ gsGameFlags := gsGameFlags or GAME_OPTION_ALLOWEXIT;
+ if TGUISwitch(GetControl('swWeaponStay')).ItemIndex = 0 then
+ gsGameFlags := gsGameFlags or GAME_OPTION_WEAPONSTAY;
+ if TGUISwitch(GetControl('swMonsters')).ItemIndex = 0 then
+ gsGameFlags := gsGameFlags or GAME_OPTION_MONSTERS;
+
+ case TGUISwitch(GetControl('swTeamHit')).ItemIndex of
+ 1: gsGameFlags := gsGameFlags or GAME_OPTION_TEAMHITTRACE;
+ 2: gsGameFlags := gsGameFlags or GAME_OPTION_TEAMHITPROJECTILE;
+ 0: gsGameFlags := gsGameFlags or GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMHITPROJECTILE;
+ end;
case TGUISwitch(GetControl('swBotsVS')).ItemIndex of
case TGUISwitch(GetControl('swBotsVS')).ItemIndex of
- 1: begin
- Options := Options or GAME_OPTION_BOTVSMONSTER;
- gcBotsVS := 'Monsters';
- end;
- 2: begin
- Options := Options or GAME_OPTION_BOTVSPLAYER or GAME_OPTION_BOTVSMONSTER;
- gcBotsVS := 'Everybody';
- end;
- else begin
- Options := Options or GAME_OPTION_BOTVSPLAYER;
- gcBotsVS := 'Players';
- end;
+ 1: gsGameFlags := gsGameFlags or GAME_OPTION_BOTVSMONSTER;
+ 2: gsGameFlags := gsGameFlags or GAME_OPTION_BOTVSPLAYER or GAME_OPTION_BOTVSMONSTER;
+ else gsGameFlags := gsGameFlags or GAME_OPTION_BOTVSPLAYER;
end;
end;
- gcMap := Map;
+ // TODO: get this crap out of here
+ gGameSettings.ItemRespawnTime := gsItemRespawnTime;
+ gGameSettings.WarmupTime := gsWarmupTime;
+ gGameSettings.SpawnInvul := gsSpawnInvul;
end;
end;
+end;
- g_Options_Write_Gameplay_Custom(GameDir+'/'+CONFIG_FILENAME);
+procedure ProcStartCustomGame();
+var
+ GameMode: Byte;
+begin
+ GameMode := LatchGameOptions('mCustomGameMenu');
+ if GameMode = GM_NONE then Exit;
- g_Game_StartCustom(Map, GameMode, gcTimeLimit, gcGoalLimit,
- gcMaxLives, Options, gcPlayers);
+ g_Console_WriteGameConfig;
+ g_Game_StartCustom(gsMap, GameMode, gsTimeLimit, gsGoalLimit,
+ gsMaxLives, gsGameFlags, gsPlayers);
end;
procedure ProcStartNetGame();
var
end;
procedure ProcStartNetGame();
var
- Map: String;
GameMode: Byte;
GameMode: Byte;
- Options: LongWord;
begin
begin
+ GameMode := LatchGameOptions('mNetServerMenu');
+ if GameMode = GM_NONE then Exit;
+
with TGUIMenu(g_ActiveWindow.GetControl('mNetServerMenu')) do
begin
with TGUIMenu(g_ActiveWindow.GetControl('mNetServerMenu')) do
begin
- Map := TGUILabel(GetControl('lbMap')).Text;
- if Map = '' then
- Exit;
- if not isWadPath(Map) then
- Exit;
-
- GameMode := TGUISwitch(GetControl('swGameMode')).ItemIndex+1;
- gnGameMode := TGUISwitch(GetControl('swGameMode')).GetText;
- gnTimeLimit := StrToIntDef(TGUIEdit(GetControl('edTimeLimit')).Text, 0);
- gnGoalLimit := StrToIntDef(TGUIEdit(GetControl('edGoalLimit')).Text, 0);
- gnMaxLives := StrToIntDef(TGUIEdit(GetControl('edMaxLives')).Text, 0);
NetPort := StrToIntDef(TGUIEdit(GetControl('edPort')).Text, 0);
NetPort := StrToIntDef(TGUIEdit(GetControl('edPort')).Text, 0);
-
- gnTeamDamage := TGUISwitch(GetControl('swTeamDamage')).ItemIndex = 0;
- gnAllowExit := TGUISwitch(GetControl('swEnableExits')).ItemIndex = 0;
- gnWeaponStay := TGUISwitch(GetControl('swWeaponStay')).ItemIndex = 0;
- gnMonsters := TGUISwitch(GetControl('swMonsters')).ItemIndex = 0;
- Options := 0;
- if gnTeamDamage then
- Options := Options or GAME_OPTION_TEAMDAMAGE;
- if gnAllowExit then
- Options := Options or GAME_OPTION_ALLOWEXIT;
- if gnWeaponStay then
- Options := Options or GAME_OPTION_WEAPONSTAY;
- if gnMonsters then
- Options := Options or GAME_OPTION_MONSTERS;
- gnPlayers := TGUISwitch(GetControl('swPlayers')).ItemIndex;
-
- case TGUISwitch(GetControl('swBotsVS')).ItemIndex of
- 1: begin
- Options := Options or GAME_OPTION_BOTVSMONSTER;
- gnBotsVS := 'Monsters';
- end;
- 2: begin
- Options := Options or GAME_OPTION_BOTVSPLAYER or GAME_OPTION_BOTVSMONSTER;
- gnBotsVS := 'Everybody';
- end;
- else begin
- Options := Options or GAME_OPTION_BOTVSPLAYER;
- gnBotsVS := 'Players';
- end;
- end;
-
- gnMap := Map;
NetServerName := TGUIEdit(GetControl('edSrvName')).Text;
NetMaxClients := Max(1, StrToIntDef(TGUIEdit(GetControl('edMaxPlayers')).Text, 1));
NetMaxClients := Min(NET_MAXCLIENTS, NetMaxClients);
NetServerName := TGUIEdit(GetControl('edSrvName')).Text;
NetMaxClients := Max(1, StrToIntDef(TGUIEdit(GetControl('edMaxPlayers')).Text, 1));
NetMaxClients := Min(NET_MAXCLIENTS, NetMaxClients);
NetUseMaster := TGUISwitch(GetControl('swUseMaster')).ItemIndex = 0;
end;
NetUseMaster := TGUISwitch(GetControl('swUseMaster')).ItemIndex = 0;
end;
- g_Options_Write_Net_Server(GameDir+'/'+CONFIG_FILENAME);
- g_Options_Write_Gameplay_Net(GameDir+'/'+CONFIG_FILENAME);
-
- g_Game_StartServer(Map, GameMode, gnTimeLimit, gnGoalLimit, gnMaxLives,
- Options, gnPlayers, 0, NetPort);
+ g_Console_WriteGameConfig;
+ g_Game_StartServer(gsMap, GameMode, gsTimeLimit, gsGoalLimit, gsMaxLives,
+ gsGameFlags, gsPlayers, 0, NetPort);
end;
procedure ProcConnectNetGame();
end;
procedure ProcConnectNetGame();
PW := TGUIEdit(GetControl('edPW')).Text;
end;
PW := TGUIEdit(GetControl('edPW')).Text;
end;
- g_Options_Write_Net_Client(GameDir+'/'+CONFIG_FILENAME);
+ g_Console_WriteGameConfig;
g_Game_StartClient(NetClientIP, NetClientPort, PW);
end;
g_Game_StartClient(NetClientIP, NetClientPort, PW);
end;
PW := TGUIEdit(GetControl('edPW')).Text;
end;
PW := TGUIEdit(GetControl('edPW')).Text;
end;
- g_Options_Write_Net_Client(GameDir+'/'+CONFIG_FILENAME);
+ g_Console_WriteGameConfig;
g_Game_StartClient(NetClientIP, NetClientPort, PW);
end;
g_Game_StartClient(NetClientIP, NetClientPort, PW);
end;
NetInitDone := True;
end;
NetInitDone := True;
end;
- g_Net_Slist_Set(NetSlistIP, NetSlistPort);
+ g_Net_Slist_Set(NetMasterList);
gState := STATE_SLIST;
g_ActiveWindow := nil;
slWaitStr := _lc[I_NET_SLIST_WAIT];
gState := STATE_SLIST;
g_ActiveWindow := nil;
slWaitStr := _lc[I_NET_SLIST_WAIT];
- g_Game_Draw;
- ReDrawWindow;
+ {$IFDEF ENABLE_RENDER}
+ r_Render_Draw;
+ {$ENDIF}
+ {$IFDEF ENABLE_SYSTEM}
+ sys_Repaint;
+ {$ENDIF}
slReturnPressed := True;
if g_Net_Slist_Fetch(slCurrent) then
slReturnPressed := True;
if g_Net_Slist_Fetch(slCurrent) then
begin
with TGUIMenu(g_ActiveWindow.GetControl('mCampaignMenu')) do
begin
begin
with TGUIMenu(g_ActiveWindow.GetControl('mCampaignMenu')) do
begin
- WAD := ExtractRelativePath(MapsDir, TGUIFileListBox(GetControl('lsWAD')).SelectedItem());
+ WAD := TGUIFileListBox(GetControl('lsWAD')).SelectedItem();
TwoPlayers := TGUISwitch(GetControl('swPlayers')).ItemIndex = 1;
end;
TwoPlayers := TGUISwitch(GetControl('swPlayers')).ItemIndex = 1;
end;
+ WAD := e_FindWadRel(MegawadDirs, WAD);
if TwoPlayers then
n := 2
if TwoPlayers then
n := 2
ProcChangeColor(nil);
end;
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);
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');
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
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');
g_Sound_Delete('MENU_SELECT');
g_Sound_Delete('MENU_OPEN');
g_Sound_Delete('MENU_CLOSE');
end;
end;
end;
end;
-procedure ProcSingle1Player();
+procedure ProcSinglePlayer (n: Integer);
+ var wad, map: AnsiString;
begin
begin
- g_Game_StartSingle(gDefaultMegawadStart, False, 1);
+ assert(n >= 1);
+ wad := g_ExtractWadName(gDefaultMegawadStart);
+ map := g_ExtractFilePathName(gDefaultMegawadStart);
+ if e_FindResource(AllMapDirs, wad) then
+ begin
+ wad := ExpandFileName(wad);
+ g_Game_StartSingle(wad + ':\' + map, n > 1, n)
+ end
+end;
+
+procedure ProcSingle1Player;
+begin
+ ProcSinglePlayer(1)
end;
end;
-procedure ProcSingle2Players();
+procedure ProcSingle2Players;
begin
begin
- g_Game_StartSingle(gDefaultMegawadStart, True, 2);
+ ProcSinglePlayer(2)
end;
procedure ProcSelectMapMenu();
end;
procedure ProcSelectMapMenu();
begin
with TGUIMenu(g_ActiveWindow.GetControl('mSelectMapMenu')) do
begin
begin
with TGUIMenu(g_ActiveWindow.GetControl('mSelectMapMenu')) do
begin
- wad := ExtractRelativePath(MapsDir, TGUIFileListBox(GetControl('lsMapWAD')).SelectedItem());
+ wad := TGUIFileListBox(GetControl('lsMapWAD')).SelectedItem();
map := TGUIListBox(GetControl('lsMapRes')).SelectedItem();
end;
if (wad = '') or (map = '') then
Exit;
map := TGUIListBox(GetControl('lsMapRes')).SelectedItem();
end;
if (wad = '') or (map = '') then
Exit;
+ wad := e_FindWadRel(MapDirs, WAD);
+
res := wad+':\'+map;
TGUILabel(TGUIMenu(g_GUI_GetWindow('CustomGameMenu').GetControl('mCustomGameMenu')).GetControl('lbMap')).Text := res;
res := wad+':\'+map;
TGUILabel(TGUIMenu(g_GUI_GetWindow('CustomGameMenu').GetControl('mCustomGameMenu')).GetControl('lbMap')).Text := res;
procedure ProcOptionsPlayersMIMenu();
var
s, a: string;
procedure ProcOptionsPlayersMIMenu();
var
s, a: string;
- b: TModelInfo;
+ i: Integer;
begin
if g_ActiveWindow.Name = 'OptionsPlayersP1Menu' then s := 'P1' else s := 'P2';
begin
if g_ActiveWindow.Name = 'OptionsPlayersP1Menu' then s := 'P1' else s := 'P2';
if a = '' then Exit;
if a = '' then Exit;
- b := g_PlayerModel_GetInfo(a);
-
+ i := g_PlayerModel_GetIndex(a);
with TGUIMenu(g_GUI_GetWindow('OptionsPlayersMIMenu').GetControl('mOptionsPlayersMIMenu')) do
begin
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];
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();
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;
end;
end;
if yes then gExit := EXIT_SIMPLE else g_GUI_HideWindow;
end;
if yes then gExit := EXIT_SIMPLE else g_GUI_HideWindow;
end;
-procedure ProcSetRussianLanguage();
+procedure ProcSetRussianLanguage;
begin
if gLanguage <> LANGUAGE_RUSSIAN then
begin
gLanguage := LANGUAGE_RUSSIAN;
gLanguageChange := True;
gAskLanguage := False;
begin
if gLanguage <> LANGUAGE_RUSSIAN then
begin
gLanguage := LANGUAGE_RUSSIAN;
gLanguageChange := True;
gAskLanguage := False;
-
- g_Options_Write_Language(GameDir+'/'+CONFIG_FILENAME);
-
- // Ñîõðàíÿåì èçìåíåíèÿ âñåõ íàñòðîåê:
ProcApplyOptions();
end;
end;
ProcApplyOptions();
end;
end;
-procedure ProcSetEnglishLanguage();
+procedure ProcSetEnglishLanguage;
begin
if gLanguage <> LANGUAGE_ENGLISH then
begin
gLanguage := LANGUAGE_ENGLISH;
gLanguageChange := True;
gAskLanguage := False;
begin
if gLanguage <> LANGUAGE_ENGLISH then
begin
gLanguage := LANGUAGE_ENGLISH;
gLanguageChange := True;
gAskLanguage := False;
-
- g_Options_Write_Language(GameDir+'/'+CONFIG_FILENAME);
-
- // Ñîõðàíÿåì èçìåíåíèÿ âñåõ íàñòðîåê:
ProcApplyOptions();
end;
end;
ProcApplyOptions();
end;
end;
ItemIndex := 0
else
ItemIndex := 1;
ItemIndex := 0
else
ItemIndex := 1;
+ with TGUISwitch(menu.GetControl('swTeamHit')) do
+ if (Options and (GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMHITPROJECTILE)) = (GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMHITPROJECTILE) then
+ ItemIndex := 0
+ else if LongBool(Options and GAME_OPTION_TEAMHITTRACE) then
+ ItemIndex := 1
+ else if LongBool(Options and GAME_OPTION_TEAMHITPROJECTILE) then
+ ItemIndex := 2
+ else
+ ItemIndex := 3;
+ with TGUISwitch(menu.GetControl('swDeathmatchKeys')) do
+ if LongBool(Options and GAME_OPTION_DMKEYS) then
+ ItemIndex := 0
+ else
+ ItemIndex := 1;
TGUIEdit(menu.GetControl('edTimeLimit')).Text := IntToStr(TimeLimit);
TGUIEdit(menu.GetControl('edGoalLimit')).Text := IntToStr(GoalLimit);
TGUIEdit(menu.GetControl('edTimeLimit')).Text := IntToStr(TimeLimit);
TGUIEdit(menu.GetControl('edGoalLimit')).Text := IntToStr(GoalLimit);
if GameType in [GT_CUSTOM, GT_SERVER] then
begin
TGUISwitch(menu.GetControl('swTeamDamage')).Enabled := True;
if GameType in [GT_CUSTOM, GT_SERVER] then
begin
TGUISwitch(menu.GetControl('swTeamDamage')).Enabled := True;
+ TGUISwitch(menu.GetControl('swTeamHit')).Enabled := True;
+ if (GameMode in [GM_DM, GM_TDM, GM_CTF]) then
+ begin
+ TGUISwitch(menu.GetControl('swDeathmatchKeys')).Enabled := True;
+ TGUILabel(menu.GetControlsText('swDeathmatchKeys')).Color := MENU_ITEMSTEXT_COLOR;
+ end
+ else
+ begin
+ TGUISwitch(menu.GetControl('swDeathmatchKeys')).Enabled := False;
+ TGUILabel(menu.GetControlsText('swDeathmatchKeys')).Color := MENU_UNACTIVEITEMS_COLOR;
+ end;
TGUIEdit(menu.GetControl('edTimeLimit')).Enabled := True;
TGUILabel(menu.GetControlsText('edTimeLimit')).Color := MENU_ITEMSTEXT_COLOR;
TGUIEdit(menu.GetControl('edGoalLimit')).Enabled := True;
TGUIEdit(menu.GetControl('edTimeLimit')).Enabled := True;
TGUILabel(menu.GetControlsText('edTimeLimit')).Color := MENU_ITEMSTEXT_COLOR;
TGUIEdit(menu.GetControl('edGoalLimit')).Enabled := True;
else
begin
TGUISwitch(menu.GetControl('swTeamDamage')).Enabled := True;
else
begin
TGUISwitch(menu.GetControl('swTeamDamage')).Enabled := True;
+ TGUISwitch(menu.GetControl('swTeamHit')).Enabled := True;
+ TGUISwitch(menu.GetControl('swDeathmatchKeys')).Enabled := False;
+ TGUILabel(menu.GetControlsText('swDeathmatchKeys')).Color := MENU_UNACTIVEITEMS_COLOR;
with TGUIEdit(menu.GetControl('edTimeLimit')) do
begin
Enabled := False;
with TGUIEdit(menu.GetControl('edTimeLimit')) do
begin
Enabled := False;
Options := Options and (not GAME_OPTION_TEAMDAMAGE);
end;
Options := Options and (not GAME_OPTION_TEAMDAMAGE);
end;
+ if TGUISwitch(menu.GetControl('swTeamHit')).Enabled then
+ begin
+ Options := Options and not (GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMHITPROJECTILE);
+ case TGUISwitch(menu.GetControl('swTeamHit')).ItemIndex of
+ 1: Options := Options or GAME_OPTION_TEAMHITTRACE;
+ 2: Options := Options or GAME_OPTION_TEAMHITPROJECTILE;
+ 0: Options := Options or GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMHITPROJECTILE;
+ end;
+ end;
+
+ if TGUISwitch(menu.GetControl('swDeathmatchKeys')).Enabled then
+ begin
+ if TGUISwitch(menu.GetControl('swDeathmatchKeys')).ItemIndex = 0 then
+ Options := Options or GAME_OPTION_DMKEYS
+ else
+ Options := Options and (not GAME_OPTION_DMKEYS);
+ end;
+
if TGUIEdit(menu.GetControl('edTimeLimit')).Enabled then
begin
n := StrToIntDef(TGUIEdit(menu.GetControl('edTimeLimit')).Text, TimeLimit);
if TGUIEdit(menu.GetControl('edTimeLimit')).Enabled then
begin
n := StrToIntDef(TGUIEdit(menu.GetControl('edTimeLimit')).Text, TimeLimit);
end;
end;
end;
end;
end;
end;
+
+ // don't forget to latch this shit
+ gsGameFlags := Options;
+ gsMaxLives := MaxLives;
+ gsGoalLimit := GoalLimit;
+ gsTimeLimit := TimeLimit;
end;
if g_Game_IsNet then MH_SEND_GameSettings;
end;
if g_Game_IsNet then MH_SEND_GameSettings;
var
menu: TGUIMenu;
list: SSArray;
var
menu: TGUIMenu;
list: SSArray;
- SR: DWORD;
begin
menu := TGUIMenu(g_GUI_GetWindow('OptionsVideoResMenu').GetControl('mOptionsVideoResMenu'));
TGUILabel(menu.GetControl('lbCurrentRes')).Text :=
begin
menu := TGUIMenu(g_GUI_GetWindow('OptionsVideoResMenu').GetControl('mOptionsVideoResMenu'));
TGUILabel(menu.GetControl('lbCurrentRes')).Text :=
- IntToStr(gScreenWidth) +
- ' x ' + IntToStr(gScreenHeight) +
+ IntToStr(gWinSizeX) +
+ ' x ' + IntToStr(gWinSizeY) +
', ' + IntToStr(gBPP) + ' bpp';
with TGUIListBox(menu.GetControl('lsResolution')) do
begin
', ' + IntToStr(gBPP) + ' bpp';
with TGUIListBox(menu.GetControl('lsResolution')) do
begin
- list := GetDisplayModes(gBPP, SR);
-
+ list := sys_GetDisplayModes(gBPP);
if list <> nil then
if list <> nil then
- begin
- Items := list;
- ItemIndex := SR;
- end
+ begin
+ Items := list;
+ ItemIndex := Length(list)
+ end
else
else
- Clear();
+ begin
+ Clear
+ end
end;
with TGUISwitch(menu.GetControl('swFullScreen')) do
end;
with TGUISwitch(menu.GetControl('swFullScreen')) do
ItemIndex := 0
else
ItemIndex := 1;
ItemIndex := 0
else
ItemIndex := 1;
+
+ TempResScale := Round(r_pixel_scale - 1);
+ with TGUISwitch(menu.GetControl('swResFactor')) do
+ ItemIndex := Min(TempResScale, gRC_Width div 640 - 1);
end;
procedure ProcApplyVideoOptions();
end;
procedure ProcApplyVideoOptions();
menu: TGUIMenu;
Fullscreen: Boolean;
SWidth, SHeight: Integer;
menu: TGUIMenu;
Fullscreen: Boolean;
SWidth, SHeight: Integer;
+ ScaleChanged: Boolean;
str: String;
begin
menu := TGUIMenu(g_GUI_GetWindow('OptionsVideoResMenu').GetControl('mOptionsVideoResMenu'));
str := TGUIListBox(menu.GetControl('lsResolution')).SelectedItem;
str: String;
begin
menu := TGUIMenu(g_GUI_GetWindow('OptionsVideoResMenu').GetControl('mOptionsVideoResMenu'));
str := TGUIListBox(menu.GetControl('lsResolution')).SelectedItem;
- SScanf(str, '%dx%d', [@SWidth, @SHeight]);
+ if str <> '' then
+ SScanf(str, '%dx%d', [@SWidth, @SHeight])
+ else
+ begin
+ SWidth := gWinSizeX;
+ SHeight := gWinSizeY;
+ TempResScale := Min(TempResScale, SWidth div 640 - 1);
+ end;
Fullscreen := TGUISwitch(menu.GetControl('swFullScreen')).ItemIndex = 0;
Fullscreen := TGUISwitch(menu.GetControl('swFullScreen')).ItemIndex = 0;
- if (SWidth <> gScreenWidth) or
- (SHeight <> gScreenHeight) or
- (Fullscreen <> gFullscreen) then
+ ScaleChanged := False;
+ if TGUISwitch(menu.GetControl('swResFactor')).ItemIndex <> TempResScale then
+ begin
+ TempResScale := Min(TGUISwitch(menu.GetControl('swResFactor')).ItemIndex, SWidth div 640 - 1);
+ r_pixel_scale := TempResScale + 1;
+ ScaleChanged := True;
+ end;
+
+ if (SWidth <> gWinSizeX) or
+ (SHeight <> gWinSizeY) or
+ (Fullscreen <> gFullscreen) or
+ ScaleChanged then
begin
gResolutionChange := True;
gRC_Width := SWidth;
begin
gResolutionChange := True;
gRC_Width := SWidth;
ProcApplyOptions();
end;
ProcApplyOptions();
end;
-procedure ProcSetFirstRussianLanguage();
+procedure ProcSetFirstRussianLanguage;
begin
gLanguage := LANGUAGE_RUSSIAN;
gLanguageChange := True;
gAskLanguage := False;
begin
gLanguage := LANGUAGE_RUSSIAN;
gLanguageChange := True;
gAskLanguage := False;
-
- g_Options_Write_Language(GameDir+'/'+CONFIG_FILENAME);
end;
end;
-procedure ProcSetFirstEnglishLanguage();
+procedure ProcSetFirstEnglishLanguage;
begin
gLanguage := LANGUAGE_ENGLISH;
gLanguageChange := True;
gAskLanguage := False;
begin
gLanguage := LANGUAGE_ENGLISH;
gLanguageChange := True;
gAskLanguage := False;
-
- g_Options_Write_Language(GameDir+'/'+CONFIG_FILENAME);
end;
procedure ProcRecallAddress();
end;
procedure ProcRecallAddress();
begin
Menu := TGUIWindow.Create('FirstLanguageMenu');
begin
Menu := TGUIWindow.Create('FirstLanguageMenu');
- with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, '', ' '))) do
+ with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, ' '))) do // space to prevent show logo
begin
Name := 'mmFirstLanguageMenu';
AddButton(@ProcSetFirstRussianLanguage, 'Ðóññêèé', '');
begin
Name := 'mmFirstLanguageMenu';
AddButton(@ProcSetFirstRussianLanguage, 'Ðóññêèé', '');
//list: SSArray;
begin
Menu := TGUIWindow.Create('MainMenu');
//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(gMenuFont, '' (*_lc[I_MENU_MAIN_MENU]*) ))) do
begin
Name := 'mmMainMenu';
AddButton(nil, _lc[I_MENU_NEW_GAME], 'NewGameMenu');
begin
Name := 'mmMainMenu';
AddButton(nil, _lc[I_MENU_NEW_GAME], 'NewGameMenu');
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('NewGameMenu');
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(gMenuFont, _lc[I_MENU_NEW_GAME]))) do
begin
Name := 'mmNewGameMenu';
AddButton(@ProcSingle1Player, _lc[I_MENU_1_PLAYER]);
begin
Name := 'mmNewGameMenu';
AddButton(@ProcSingle1Player, _lc[I_MENU_1_PLAYER]);
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('NetGameMenu');
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(gMenuFont, _lc[I_MENU_MULTIPLAYER]))) do
begin
Name := 'mmNetGameMenu';
AddButton(@ProcRecallAddress, _lc[I_MENU_START_CLIENT], 'NetClientMenu');
begin
Name := 'mmNetGameMenu';
AddButton(@ProcRecallAddress, _lc[I_MENU_START_CLIENT], 'NetClientMenu');
begin
Name := 'lbMap';
FixedLength := 16;
begin
Name := 'lbMap';
FixedLength := 16;
- Text := gnMap;
+ Text := gsMap;
OnClick := @ProcSelectMapMenu;
end;
with AddSwitch(_lc[I_MENU_GAME_TYPE]) do
OnClick := @ProcSelectMapMenu;
end;
with AddSwitch(_lc[I_MENU_GAME_TYPE]) do
AddItem(_lc[I_MENU_GAME_TYPE_TDM]);
AddItem(_lc[I_MENU_GAME_TYPE_CTF]);
AddItem(_lc[I_MENU_GAME_TYPE_COOP]);
AddItem(_lc[I_MENU_GAME_TYPE_TDM]);
AddItem(_lc[I_MENU_GAME_TYPE_CTF]);
AddItem(_lc[I_MENU_GAME_TYPE_COOP]);
- case g_Game_TextToMode(gnGameMode) of
+ case g_Game_TextToMode(gsGameMode) of
GM_NONE,
GM_DM: ItemIndex := 0;
GM_TDM: ItemIndex := 1;
GM_NONE,
GM_DM: ItemIndex := 0;
GM_TDM: ItemIndex := 1;
GM_SINGLE,
GM_COOP: ItemIndex := 3;
end;
GM_SINGLE,
GM_COOP: ItemIndex := 3;
end;
- OnChange := ProcSwitchMonstersNet;
+ OnChange := ProcSwitchMonstersCustom;
end;
with AddEdit(_lc[I_MENU_TIME_LIMIT]) do
begin
end;
with AddEdit(_lc[I_MENU_TIME_LIMIT]) do
begin
OnlyDigits := True;
Width := 4;
MaxLength := 5;
OnlyDigits := True;
Width := 4;
MaxLength := 5;
- if gnTimeLimit > 0 then
- Text := IntToStr(gnTimeLimit);
+ if gsTimeLimit > 0 then
+ Text := IntToStr(gsTimeLimit);
end;
with AddEdit(_lc[I_MENU_GOAL_LIMIT]) do
begin
end;
with AddEdit(_lc[I_MENU_GOAL_LIMIT]) do
begin
OnlyDigits := True;
Width := 4;
MaxLength := 5;
OnlyDigits := True;
Width := 4;
MaxLength := 5;
- if gnGoalLimit > 0 then
- Text := IntToStr(gnGoalLimit);
+ if gsGoalLimit > 0 then
+ Text := IntToStr(gsGoalLimit);
end;
with AddEdit(_lc[I_MENU_MAX_LIVES]) do
begin
Name := 'edMaxLives';
OnlyDigits := True;
Width := 4;
end;
with AddEdit(_lc[I_MENU_MAX_LIVES]) do
begin
Name := 'edMaxLives';
OnlyDigits := True;
Width := 4;
- MaxLength := 3;
- if gnMaxLives > 0 then
- Text := IntToStr(gnMaxLives);
+ MaxLength := 5;
+ if gsMaxLives > 0 then
+ Text := IntToStr(gsMaxLives);
end;
end;
- with AddSwitch(_lc[I_MENU_SERVER_PLAYERS]) do
+ with AddEdit(_lc[I_MENU_ITEM_RESPAWN_TIME]) do
+ begin
+ Name := 'edItemRespawnTime';
+ OnlyDigits := True;
+ Width := 4;
+ MaxLength := 5;
+ if gsItemRespawnTime > 0 then
+ Text := IntToStr(gsItemRespawnTime);
+ end;
+ with AddSwitch(_lc[I_MENU_PLAYERS]) do
begin
Name := 'swPlayers';
AddItem(_lc[I_MENU_COUNT_NONE]);
AddItem(_lc[I_MENU_PLAYERS_ONE]);
AddItem(_lc[I_MENU_PLAYERS_TWO]);
begin
Name := 'swPlayers';
AddItem(_lc[I_MENU_COUNT_NONE]);
AddItem(_lc[I_MENU_PLAYERS_ONE]);
AddItem(_lc[I_MENU_PLAYERS_TWO]);
- ItemIndex := gnPlayers;
+ ItemIndex := gsPlayers;
end;
with AddSwitch(_lc[I_MENU_TEAM_DAMAGE]) do
begin
Name := 'swTeamDamage';
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
end;
with AddSwitch(_lc[I_MENU_TEAM_DAMAGE]) do
begin
Name := 'swTeamDamage';
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
- if gnTeamDamage then
+ if LongBool(gsGameFlags and GAME_OPTION_TEAMDAMAGE) then
+ ItemIndex := 0
+ else
+ ItemIndex := 1;
+ end;
+ with AddSwitch(_lc[I_MENU_TEAM_HIT]) do
+ begin
+ Name := 'swTeamHit';
+ AddItem(_lc[I_MENU_TEAM_HIT_BOTH]);
+ AddItem(_lc[I_MENU_TEAM_HIT_TRACE]);
+ AddItem(_lc[I_MENU_TEAM_HIT_PROJECTILE]);
+ AddItem(_lc[I_MENU_TEAM_HIT_NOTHING]);
+ if (gsGameFlags and (GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMHITPROJECTILE)) = (GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMHITPROJECTILE) then
+ ItemIndex := 0
+ else if LongBool(gsGameFlags and GAME_OPTION_TEAMHITTRACE) then
+ ItemIndex := 1
+ else if LongBool(gsGameFlags and GAME_OPTION_TEAMHITPROJECTILE) then
+ ItemIndex := 2
+ else
+ ItemIndex := 3;
+ end;
+ with AddSwitch(_lc[I_MENU_DEATHMATCH_KEYS]) do
+ begin
+ Name := 'swDeathmatchKeys';
+ AddItem(_lc[I_MENU_YES]);
+ AddItem(_lc[I_MENU_NO]);
+ if LongBool(gsGameFlags and GAME_OPTION_DMKEYS) then
ItemIndex := 0
else
ItemIndex := 1;
ItemIndex := 0
else
ItemIndex := 1;
Name := 'swEnableExits';
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
Name := 'swEnableExits';
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
- if gnAllowExit then
+ if LongBool(gsGameFlags and GAME_OPTION_ALLOWEXIT) then
ItemIndex := 0
else
ItemIndex := 1;
ItemIndex := 0
else
ItemIndex := 1;
Name := 'swWeaponStay';
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
Name := 'swWeaponStay';
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
- if gnWeaponStay then
+ if LongBool(gsGameFlags and GAME_OPTION_WEAPONSTAY) then
ItemIndex := 0
else
ItemIndex := 1;
ItemIndex := 0
else
ItemIndex := 1;
Name := 'swMonsters';
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
Name := 'swMonsters';
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
- if gnMonsters then
+ if LongBool(gsGameFlags and GAME_OPTION_MONSTERS) then
ItemIndex := 0
else
ItemIndex := 1;
ItemIndex := 0
else
ItemIndex := 1;
AddItem(_lc[I_MENU_BOTS_VS_MONSTERS]);
AddItem(_lc[I_MENU_BOTS_VS_ALL]);
ItemIndex := 2;
AddItem(_lc[I_MENU_BOTS_VS_MONSTERS]);
AddItem(_lc[I_MENU_BOTS_VS_ALL]);
ItemIndex := 2;
- if gnBotsVS = 'Players' then
+ if not LongBool(gsGameFlags and GAME_OPTION_BOTVSMONSTER) then
ItemIndex := 0;
ItemIndex := 0;
- if gnBotsVS = 'Monsters' then
+ if not LongBool(gsGameFlags and GAME_OPTION_BOTVSPLAYER) then
ItemIndex := 1;
end;
AddSpace();
ItemIndex := 1;
end;
AddSpace();
begin
Name := 'lbMap';
FixedLength := 16;
begin
Name := 'lbMap';
FixedLength := 16;
- Text := gcMap;
+ Text := gsMap;
OnClick := @ProcSelectMapMenu;
end;
with AddSwitch(_lc[I_MENU_GAME_TYPE]) do
OnClick := @ProcSelectMapMenu;
end;
with AddSwitch(_lc[I_MENU_GAME_TYPE]) do
AddItem(_lc[I_MENU_GAME_TYPE_TDM]);
AddItem(_lc[I_MENU_GAME_TYPE_CTF]);
AddItem(_lc[I_MENU_GAME_TYPE_COOP]);
AddItem(_lc[I_MENU_GAME_TYPE_TDM]);
AddItem(_lc[I_MENU_GAME_TYPE_CTF]);
AddItem(_lc[I_MENU_GAME_TYPE_COOP]);
- case g_Game_TextToMode(gcGameMode) of
+ case g_Game_TextToMode(gsGameMode) of
GM_NONE,
GM_DM: ItemIndex := 0;
GM_TDM: ItemIndex := 1;
GM_NONE,
GM_DM: ItemIndex := 0;
GM_TDM: ItemIndex := 1;
OnlyDigits := True;
Width := 4;
MaxLength := 5;
OnlyDigits := True;
Width := 4;
MaxLength := 5;
- if gcTimeLimit > 0 then
- Text := IntToStr(gcTimeLimit);
+ if gsTimeLimit > 0 then
+ Text := IntToStr(gsTimeLimit);
end;
with AddEdit(_lc[I_MENU_GOAL_LIMIT]) do
begin
end;
with AddEdit(_lc[I_MENU_GOAL_LIMIT]) do
begin
OnlyDigits := True;
Width := 4;
MaxLength := 5;
OnlyDigits := True;
Width := 4;
MaxLength := 5;
- if gcGoalLimit > 0 then
- Text := IntToStr(gcGoalLimit);
+ if gsGoalLimit > 0 then
+ Text := IntToStr(gsGoalLimit);
end;
with AddEdit(_lc[I_MENU_MAX_LIVES]) do
begin
end;
with AddEdit(_lc[I_MENU_MAX_LIVES]) do
begin
OnlyDigits := True;
Width := 4;
MaxLength := 5;
OnlyDigits := True;
Width := 4;
MaxLength := 5;
- if gcMaxLives > 0 then
- Text := IntToStr(gcMaxLives);
+ if gsMaxLives > 0 then
+ Text := IntToStr(gsMaxLives);
+ end;
+ with AddEdit(_lc[I_MENU_ITEM_RESPAWN_TIME]) do
+ begin
+ Name := 'edItemRespawnTime';
+ OnlyDigits := True;
+ Width := 4;
+ MaxLength := 5;
+ if gsItemRespawnTime > 0 then
+ Text := IntToStr(gsItemRespawnTime);
end;
with AddSwitch(_lc[I_MENU_PLAYERS]) do
begin
end;
with AddSwitch(_lc[I_MENU_PLAYERS]) do
begin
AddItem(_lc[I_MENU_COUNT_NONE]);
AddItem(_lc[I_MENU_PLAYERS_ONE]);
AddItem(_lc[I_MENU_PLAYERS_TWO]);
AddItem(_lc[I_MENU_COUNT_NONE]);
AddItem(_lc[I_MENU_PLAYERS_ONE]);
AddItem(_lc[I_MENU_PLAYERS_TWO]);
- ItemIndex := gcPlayers;
+ ItemIndex := gsPlayers;
end;
with AddSwitch(_lc[I_MENU_TEAM_DAMAGE]) do
begin
Name := 'swTeamDamage';
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
end;
with AddSwitch(_lc[I_MENU_TEAM_DAMAGE]) do
begin
Name := 'swTeamDamage';
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
- if gcTeamDamage then
+ if LongBool(gsGameFlags and GAME_OPTION_TEAMDAMAGE) then
+ ItemIndex := 0
+ else
+ ItemIndex := 1;
+ end;
+ with AddSwitch(_lc[I_MENU_TEAM_HIT]) do
+ begin
+ Name := 'swTeamHit';
+ AddItem(_lc[I_MENU_TEAM_HIT_BOTH]);
+ AddItem(_lc[I_MENU_TEAM_HIT_TRACE]);
+ AddItem(_lc[I_MENU_TEAM_HIT_PROJECTILE]);
+ AddItem(_lc[I_MENU_TEAM_HIT_NOTHING]);
+ if (gsGameFlags and (GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMHITPROJECTILE)) = (GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMHITPROJECTILE) then
+ ItemIndex := 0
+ else if LongBool(gsGameFlags and GAME_OPTION_TEAMHITTRACE) then
+ ItemIndex := 1
+ else if LongBool(gsGameFlags and GAME_OPTION_TEAMHITPROJECTILE) then
+ ItemIndex := 2
+ else
+ ItemIndex := 3;
+ end;
+ with AddSwitch(_lc[I_MENU_DEATHMATCH_KEYS]) do
+ begin
+ Name := 'swDeathmatchKeys';
+ AddItem(_lc[I_MENU_YES]);
+ AddItem(_lc[I_MENU_NO]);
+ if LongBool(gsGameFlags and GAME_OPTION_DMKEYS) then
ItemIndex := 0
else
ItemIndex := 1;
ItemIndex := 0
else
ItemIndex := 1;
Name := 'swEnableExits';
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
Name := 'swEnableExits';
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
- if gcAllowExit then
+ if LongBool(gsGameFlags and GAME_OPTION_ALLOWEXIT) then
ItemIndex := 0
else
ItemIndex := 1;
ItemIndex := 0
else
ItemIndex := 1;
Name := 'swWeaponStay';
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
Name := 'swWeaponStay';
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
- if gcWeaponStay then
+ if LongBool(gsGameFlags and GAME_OPTION_WEAPONSTAY) then
ItemIndex := 0
else
ItemIndex := 1;
ItemIndex := 0
else
ItemIndex := 1;
Name := 'swMonsters';
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
Name := 'swMonsters';
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
- if gcMonsters then
+ if LongBool(gsGameFlags and GAME_OPTION_MONSTERS) then
ItemIndex := 0
else
ItemIndex := 1;
ItemIndex := 0
else
ItemIndex := 1;
AddItem(_lc[I_MENU_BOTS_VS_MONSTERS]);
AddItem(_lc[I_MENU_BOTS_VS_ALL]);
ItemIndex := 2;
AddItem(_lc[I_MENU_BOTS_VS_MONSTERS]);
AddItem(_lc[I_MENU_BOTS_VS_ALL]);
ItemIndex := 2;
- if gcBotsVS = 'Players' then
+ if not LongBool(gsGameFlags and GAME_OPTION_BOTVSMONSTER) then
ItemIndex := 0;
ItemIndex := 0;
- if gcBotsVS = 'Monsters' then
+ if not LongBool(gsGameFlags and GAME_OPTION_BOTVSPLAYER) then
ItemIndex := 1;
end;
AddSpace();
ItemIndex := 1;
end;
AddSpace();
Sort := True;
Dirs := True;
FileMask := '*.wad|*.pk3|*.zip|*.dfz';
Sort := True;
Dirs := True;
FileMask := '*.wad|*.pk3|*.zip|*.dfz';
- SetBase(MapsDir+'megawads/');
+ SetBase(MegawadDirs);
end;
with AddLabel(_lc[I_MENU_MAP_NAME]) do
end;
with AddLabel(_lc[I_MENU_MAP_NAME]) do
Sort := True;
Dirs := True;
FileMask := '*.wad|*.pk3|*.zip|*.dfz';
Sort := True;
Dirs := True;
FileMask := '*.wad|*.pk3|*.zip|*.dfz';
- SetBase(MapsDir);
+ SetBase(MapDirs);
end;
with AddList(_lc[I_MENU_MAP_RESOURCE], 12, 4) do
begin
end;
with AddList(_lc[I_MENU_MAP_RESOURCE], 12, 4) do
begin
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('OptionsMenu');
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(gMenuFont, _lc[I_MENU_OPTIONS]))) do
begin
Name := 'mmOptionsMenu';
AddButton(nil, _lc[I_MENU_VIDEO_OPTIONS], 'OptionsVideoMenu');
begin
Name := 'mmOptionsMenu';
AddButton(nil, _lc[I_MENU_VIDEO_OPTIONS], 'OptionsVideoMenu');
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
end;
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
end;
+ with AddSwitch(_lc[I_MENU_VIDEO_INTERPOLATION]) do
+ begin
+ Name := 'swInterp';
+ AddItem(_lc[I_MENU_YES]);
+ AddItem(_lc[I_MENU_NO]);
+ end;
with AddSwitch(_lc[I_MENU_VIDEO_LEGACY_COMPATIBLE]) do
begin
Name := 'swLegacyNPOT';
with AddSwitch(_lc[I_MENU_VIDEO_LEGACY_COMPATIBLE]) do
begin
Name := 'swLegacyNPOT';
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
end;
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
end;
+ with AddSwitch(_lc[I_MENU_GAME_SCALE_FACTOR]) do
+ begin
+ Name := 'swResFactor';
+ AddItem('1x');
+ for i := 2 to gRC_Width div 640 do
+ AddItem(IntToStr(i) + 'x');
+ end;
AddSpace();
AddButton(@ProcApplyVideoOptions, _lc[I_MENU_RESOLUTION_APPLY]);
UpdateIndex();
AddSpace();
AddButton(@ProcApplyVideoOptions, _lc[I_MENU_RESOLUTION_APPLY]);
UpdateIndex();
begin
Name := 'mOptionsControlsJoystickMenu';
for i := 0 to e_MaxJoys - 1 do
begin
Name := 'mOptionsControlsJoystickMenu';
for i := 0 to e_MaxJoys - 1 do
- if e_JoystickAvailable[i] then
- with AddScroll(Format(_lc[I_MENU_CONTROL_DEADZONE], [i + 1])) do
- begin
- Name := 'scDeadzone' + IntToStr(i);
- Max := 20
- end
+ with AddScroll(Format(_lc[I_MENU_CONTROL_DEADZONE], [i + 1])) do
+ begin
+ Name := 'scDeadzone' + IntToStr(i);
+ Max := 20
+ end
end;
Menu.DefControl := 'mOptionsControlsJoystickMenu';
g_GUI_AddWindow(Menu);
end;
Menu.DefControl := 'mOptionsControlsJoystickMenu';
g_GUI_AddWindow(Menu);
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('GameSingleMenu');
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(gMenuFont, _lc[I_MENU_MAIN_MENU]))) do
begin
Name := 'mmGameSingleMenu';
AddButton(nil, _lc[I_MENU_LOAD_GAME], 'LoadMenu');
begin
Name := 'mmGameSingleMenu';
AddButton(nil, _lc[I_MENU_LOAD_GAME], 'LoadMenu');
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('GameCustomMenu');
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(gMenuFont, _lc[I_MENU_MAIN_MENU]))) do
begin
Name := 'mmGameCustomMenu';
AddButton(nil, _lc[I_MENU_CHANGE_PLAYERS], 'TeamMenu');
begin
Name := 'mmGameCustomMenu';
AddButton(nil, _lc[I_MENU_CHANGE_PLAYERS], 'TeamMenu');
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('GameServerMenu');
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(gMenuFont, _lc[I_MENU_MAIN_MENU]))) do
begin
Name := 'mmGameServerMenu';
AddButton(nil, _lc[I_MENU_CHANGE_PLAYERS], 'TeamMenu');
begin
Name := 'mmGameServerMenu';
AddButton(nil, _lc[I_MENU_CHANGE_PLAYERS], 'TeamMenu');
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('GameClientMenu');
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(gMenuFont, _lc[I_MENU_MAIN_MENU]))) do
begin
Name := 'mmGameClientMenu';
AddButton(nil, _lc[I_MENU_CHANGE_PLAYERS], 'TeamMenu');
begin
Name := 'mmGameClientMenu';
AddButton(nil, _lc[I_MENU_CHANGE_PLAYERS], 'TeamMenu');
AddItem(_lc[I_MENU_NO]);
ItemIndex := 1;
end;
AddItem(_lc[I_MENU_NO]);
ItemIndex := 1;
end;
+ with AddSwitch(_lc[I_MENU_TEAM_HIT]) do
+ begin
+ Name := 'swTeamHit';
+ AddItem(_lc[I_MENU_TEAM_HIT_BOTH]);
+ AddItem(_lc[I_MENU_TEAM_HIT_TRACE]);
+ AddItem(_lc[I_MENU_TEAM_HIT_PROJECTILE]);
+ AddItem(_lc[I_MENU_TEAM_HIT_NOTHING]);
+ ItemIndex := 0
+ end;
+ with AddSwitch(_lc[I_MENU_DEATHMATCH_KEYS]) do
+ begin
+ Name := 'swDeathmatchKeys';
+ AddItem(_lc[I_MENU_YES]);
+ AddItem(_lc[I_MENU_NO]);
+ ItemIndex := 1;
+ end;
with AddEdit(_lc[I_MENU_TIME_LIMIT]) do
begin
Name := 'edTimeLimit';
with AddEdit(_lc[I_MENU_TIME_LIMIT]) do
begin
Name := 'edTimeLimit';
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('TeamMenu');
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(gMenuFont, _lc[I_MENU_CHANGE_PLAYERS]))) do
begin
Name := 'mmTeamMenu';
AddButton(@ProcJoinRed, _lc[I_MENU_JOIN_RED], '').Name := 'tmJoinRed';
begin
Name := 'mmTeamMenu';
AddButton(@ProcJoinRed, _lc[I_MENU_JOIN_RED], '').Name := 'tmJoinRed';
procedure g_Menu_Init();
begin
MenuLoadData();
procedure g_Menu_Init();
begin
MenuLoadData();
- g_GUI_Init();
CreateAllMenus();
end;
procedure g_Menu_Free();
begin
CreateAllMenus();
end;
procedure g_Menu_Free();
begin
- g_GUI_Destroy();
-
- e_WriteLog('Releasing menu data...', TMsgType.Notify);
-
MenuFreeData();
end;
MenuFreeData();
end;