From: binarymaster Date: Mon, 14 Aug 2017 08:56:27 +0000 (+0300) Subject: Menu: Add flamethrower key binds X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=1fce622b701683e52c37f44e82ecd56da6cef7e3;p=d2df-sdl.git Menu: Add flamethrower key binds --- diff --git a/src/game/g_language.pas b/src/game/g_language.pas index 61b46a3..aa82810 100644 --- a/src/game/g_language.pas +++ b/src/game/g_language.pas @@ -111,6 +111,7 @@ type I_GAME_WEAPON7, I_GAME_WEAPON8, I_GAME_WEAPON9, + I_GAME_WEAPON10, I_MENU_START_GAME, I_MENU_MAIN_MENU, @@ -782,7 +783,7 @@ const ('GAME WEAPON4', 'Super Shotgun', 'Äâóñòâîëêà'), ('GAME WEAPON5', 'Chaingun', - 'Ïóëåìåò'), + 'Ïóëåì¸ò'), ('GAME WEAPON6', 'Rocket Launcher', 'Ðàêåòíèöà'), ('GAME WEAPON7', 'Plasma Gun', @@ -790,7 +791,9 @@ const ('GAME WEAPON8', 'BFG9000', 'BFG9000'), ('GAME WEAPON9', 'Super Chaingun', - 'Ñóïåðïóëåìåò'), + 'Ñóïåðïóëåì¸ò'), + ('GAME WEAPON10', 'Flamethrower', + 'Îãíåì¸ò'), ('MENU START GAME', 'Start Game', 'ÍÀ×ÀÒÜ ÈÃÐÓ'), diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas index 8bd768d..29817ae 100644 --- a/src/game/g_menu.pas +++ b/src/game/g_menu.pas @@ -43,7 +43,7 @@ implementation uses 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_basic, g_console, g_sound, g_gfx, g_player, g_options, g_weapons, e_log, SysUtils, CONFIG, g_playermodel, DateUtils, MAPSTRUCT, wadreader, Math, g_saveload, e_textures, GL, GLExt, g_language, @@ -192,7 +192,7 @@ begin menu := TGUIMenu(g_GUI_GetWindow('OptionsControlsP1MenuWeapons').GetControl('mOptionsControlsP1MenuWeapons')); with menu, gGameControls.P1Control do begin - for i := 0 to 9 do + for i := WP_FIRST to WP_LAST do begin KeyWeapon[i] := TGUIKeyRead2(GetControl(_lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)])).Key0; KeyWeapon2[i] := TGUIKeyRead2(GetControl(_lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)])).Key1; @@ -228,7 +228,7 @@ begin menu := TGUIMenu(g_GUI_GetWindow('OptionsControlsP2MenuWeapons').GetControl('mOptionsControlsP2MenuWeapons')); with menu, gGameControls.P2Control do begin - for i := 0 to 9 do + for i := WP_FIRST to WP_LAST do begin KeyWeapon[i] := TGUIKeyRead2(GetControl(_lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)])).Key0; KeyWeapon2[i] := TGUIKeyRead2(GetControl(_lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)])).Key1; @@ -374,7 +374,7 @@ begin menu := TGUIMenu(g_GUI_GetWindow('OptionsControlsP1MenuWeapons').GetControl('mOptionsControlsP1MenuWeapons')); with menu, gGameControls.P1Control do begin - for i := 0 to 9 do + for i := WP_FIRST to WP_LAST do begin TGUIKeyRead2(GetControl(_lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)])).Key0 := KeyWeapon[i]; TGUIKeyRead2(GetControl(_lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)])).Key1 := KeyWeapon2[i]; @@ -410,7 +410,7 @@ begin menu := TGUIMenu(g_GUI_GetWindow('OptionsControlsP2MenuWeapons').GetControl('mOptionsControlsP2MenuWeapons')); with menu, gGameControls.P2Control do begin - for i := 0 to 9 do + for i := WP_FIRST to WP_LAST do begin TGUIKeyRead2(GetControl(_lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)])).Key0 := KeyWeapon[i]; TGUIKeyRead2(GetControl(_lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)])).Key1 := KeyWeapon2[i]; @@ -2663,7 +2663,7 @@ begin with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_PLAYER_1_WEAPONS]))) do begin Name := 'mOptionsControlsP1MenuWeapons'; - for i := 0 to 9 do + for i := WP_FIRST to WP_LAST do AddKeyRead2(_lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)]).Name := _lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)]; end; @@ -2692,7 +2692,7 @@ begin with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_PLAYER_2_WEAPONS]))) do begin Name := 'mOptionsControlsP2MenuWeapons'; - for i := 0 to 9 do + for i := WP_FIRST to WP_LAST do AddKeyRead2(_lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)]).Name := _lc[TStrings_Locale(Cardinal(I_GAME_WEAPON0) + i)]; end; diff --git a/src/game/g_options.pas b/src/game/g_options.pas index 5caaf40..416f3b3 100644 --- a/src/game/g_options.pas +++ b/src/game/g_options.pas @@ -19,7 +19,7 @@ unit g_options; interface uses - g_language; + g_language, g_weapons; type TPlayerControl = record @@ -33,7 +33,7 @@ type KeyPrevWeapon: Word; KeyOpen: Word; KeyStrafe: Word; - KeyWeapon: array [0..9] of Word; + KeyWeapon: array [WP_FIRST..WP_LAST] of Word; KeyRight2: Word; KeyLeft2: Word; @@ -45,7 +45,7 @@ type KeyPrevWeapon2: Word; KeyOpen2: Word; KeyStrafe2: Word; - KeyWeapon2: array [0..9] of Word; + KeyWeapon2: array [WP_FIRST..WP_LAST] of Word; end; TGameControls = record