hedgewars: comparison hedgewars/uInputHandler.pas

equal deleted inserted replaced

-:31570b766315
+:ed5a6478e710
 (*
 * Hedgewars, a free turn based strategy game
-* Copyright (c) 2004-2013 Andrey Korotaev <unC0Rr@gmail.com>
+* Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; version 2 of the License
 *
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 *)
 {$INCLUDE "options.inc"}
 unit uInputHandler;
 procedure ControllerAxisEvent(joy, axis: Byte; value: Integer);
 procedure ControllerHatEvent(joy, hat, value: Byte);
 procedure ControllerButtonEvent(joy, button: Byte; pressed: Boolean);
 implementation
-uses uConsole, uCommands, uMisc, uVariables, uConsts, uUtils, uDebug, uPhysFSLayer;
+uses uConsole, uCommands, uVariables, uConsts, uUtils, uDebug, uPhysFSLayer;
 const
 LSHIFT = $0200;
 RSHIFT = $0400;
 LALT   = $0800;
 RALT   = $1000;
 LCTRL  = $2000;
 RCTRL  = $4000;
 var tkbd: array[0..cKbdMaxIndex] of boolean;
 KeyNames: array [0..cKeyMaxIndex] of string[15];
 CurrentBinds: TBinds;
 ControllerNumControllers: Integer;
 KeyNameToCode:= code;
 end;
 (*
 procedure MaskModifier(var code: LongInt; Modifier: LongWord);
 begin
 if(Modifier and KMOD_LSHIFT) <> 0 then code:= code or LSHIFT;
 if(Modifier and KMOD_RSHIFT) <> 0 then code:= code or LSHIFT;
 if(Modifier and KMOD_LALT) <> 0 then code:= code or LALT;
 if(Modifier and KMOD_RALT) <> 0 then code:= code or LALT;
 if(Modifier and KMOD_LCTRL) <> 0 then code:= code or LCTRL;
 if(Modifier and KMOD_RCTRL) <> 0 then code:= code or LCTRL;
 end;
 *)
 procedure MaskModifier(Modifier: shortstring; var code: LongInt);
-var mod_ : shortstring;
+var mod_ : shortstring = '';
 ModifierCount, i: LongInt;
 begin
 if Modifier = '' then exit;
 ModifierCount:= 0;
 if(Modifier[i] = ':') then inc(ModifierCount);
 SplitByChar(Modifier, mod_, ':');//remove the first mod: part
 Modifier:= mod_;
 for i:= 0 to ModifierCount do
 begin
 mod_:= '';
 SplitByChar(Modifier, mod_, ':');
 if (Modifier = 'lshift')                    then code:= code or LSHIFT;
 if (Modifier = 'rshift')                    then code:= code or RSHIFT;
 if (Modifier = 'lalt')                      then code:= code or LALT;
 and (not CurrentTeam^.ExtDriven)
 then bShowAmmoMenu:= false;
 if KeyDown then
 begin
+Trusted:= Trusted and (not isPaused); //releasing keys during pause should be allowed on the other hand
 if CurrentBinds[code] = 'switch' then
 LocalMessage:= LocalMessage or gmSwitch
 else if CurrentBinds[code] = '+precise' then
 LocalMessage:= LocalMessage or gmPrecise;
 ParseCommand(CurrentBinds[code], Trusted);
 if (CurrentTeam <> nil) and (not CurrentTeam^.ExtDriven) and (ReadyTimeLeft > 1) then
 ParseCommand('gencmd R', true)
 end
 else if (CurrentBinds[code][1] = '+') then
 begin
 if CurrentBinds[code] = '+precise' then
-LocalMessage:= LocalMessage and not(gmPrecise);
+LocalMessage:= LocalMessage and (not gmPrecise);
 s:= CurrentBinds[code];
 s[1]:= '-';
 ParseCommand(s, Trusted);
 if (CurrentTeam <> nil) and (not CurrentTeam^.ExtDriven) and (ReadyTimeLeft > 1) then
 ParseCommand('gencmd R', true)
 end
 else
 begin
 if CurrentBinds[code] = 'switch' then
-LocalMessage:= LocalMessage and not(gmSwitch)
+LocalMessage:= LocalMessage and (not gmSwitch)
 end
 end
 end;
 procedure ProcessKey(event: TSDL_KeyboardEvent); inline;
 ControllerEnabled:= 1;
 if ControllerNumAxes[j] > 20 then
 ControllerNumAxes[j]:= 20;
 //if ControllerNumBalls[j] > 20 then ControllerNumBalls[j]:= 20;
 if ControllerNumHats[j] > 20 then
 ControllerNumHats[j]:= 20;
 if ControllerNumButtons[j] > 20 then
 ControllerNumButtons[j]:= 20;
 (*// reset all buttons/axes
 for i:= 0 to pred(ControllerNumAxes[j]) do
 var i: LongInt;
 f: PFSFile;
 p, l: shortstring;
 b: byte;
 begin
+if cOnlyStats then exit;
 AddFileLog('[BINDS] Loading binds from: ' + s);
 l:= '';
 if pfsExists(s) then
 begin
 p:= '';
 i:= 1;
 while (i <= length(l)) and (l[i] <> '=') do
 begin
-if l[i] <> '%' then
+if l[i] = '%' then
-begin
-p:= p + l[i];
-inc(i)
-end else
 begin
 l[i]:= '$';
 val(copy(l, i, 3), b);
 p:= p + char(b);
 inc(i, 3)
+end
+else
+begin
+p:= p + l[i];
+inc(i)
 end;
 end;
 if i < length(l) then
 begin
 l:= copy(l, i + 1, length(l) - i);
 if l <> 'default' then
 begin
+if (length(l) = 2) and (l[1] = '\') then
+l:= l[1] + ''
+else if (l[1] = '"') and (l[length(l)] = '"') then
+l:= copy(l, 2, length(l) - 2);
 p:= cmd + ' ' + l + ' ' + p;
 ParseCommand(p, true)
 end
 end
 end;
 pfsClose(f)
 end
 else
 AddFileLog('[BINDS] file not found');
 end;
 Delete(KeyName, byte(KeyName[0]), 1);
 b:= KeyNameToCode(id, Modifier);
 if b = 0 then
 OutError(errmsgUnknownVariable + ' "' + id + '"', false)
 else
 begin
 // add bind: first check if this cmd is already bound, and remove old bind
 i:= cKbdMaxIndex;
 repeat
 dec(i)
 until (i < 0) or (binds[i] = KeyName);

branch	sdl2transition
changeset 11362	ed5a6478e710
parent 11360	7a7611adf715
parent 11046	47a8c19ecb60
child 11365	b8b208501475