equal
deleted
inserted
replaced
145 begin |
145 begin |
146 if (i > 3) and (tkbdn[i] <> 0) and not ((CurrentBinds[i] = 'put') or (CurrentBinds[i] = 'ammomenu') or (CurrentBinds[i] = '+cur_u') or (CurrentBinds[i] = '+cur_d') or (CurrentBinds[i] = '+cur_l') or (CurrentBinds[i] = '+cur_r')) then hideAmmoMenu:= true; |
146 if (i > 3) and (tkbdn[i] <> 0) and not ((CurrentBinds[i] = 'put') or (CurrentBinds[i] = 'ammomenu') or (CurrentBinds[i] = '+cur_u') or (CurrentBinds[i] = '+cur_d') or (CurrentBinds[i] = '+cur_l') or (CurrentBinds[i] = '+cur_r')) then hideAmmoMenu:= true; |
147 if (tkbd[i] = 0) and (tkbdn[i] <> 0) then |
147 if (tkbd[i] = 0) and (tkbdn[i] <> 0) then |
148 begin |
148 begin |
149 ParseCommand(CurrentBinds[i], Trusted); |
149 ParseCommand(CurrentBinds[i], Trusted); |
150 if (CurrentTeam <> nil) and not CurrentTeam^.ExtDriven and (ReadyTimeLeft > 1) then ParseCommand('gencmd R', true) |
150 if (CurrentTeam <> nil) and (not CurrentTeam^.ExtDriven) and (ReadyTimeLeft > 1) then ParseCommand('gencmd R', true) |
151 end |
151 end |
152 else if (CurrentBinds[i][1] = '+') |
152 else if (CurrentBinds[i][1] = '+') |
153 and (tkbdn[i] = 0) |
153 and (tkbdn[i] = 0) |
154 and (tkbd[i] <> 0) then |
154 and (tkbd[i] <> 0) then |
155 begin |
155 begin |
156 s:= CurrentBinds[i]; |
156 s:= CurrentBinds[i]; |
157 s[1]:= '-'; |
157 s[1]:= '-'; |
158 ParseCommand(s, Trusted); |
158 ParseCommand(s, Trusted); |
159 if (CurrentTeam <> nil) and not CurrentTeam^.ExtDriven and (ReadyTimeLeft > 1) then ParseCommand('gencmd R', true) |
159 if (CurrentTeam <> nil) and (not CurrentTeam^.ExtDriven) and (ReadyTimeLeft > 1) then ParseCommand('gencmd R', true) |
160 end; |
160 end; |
161 tkbd[i]:= tkbdn[i] |
161 tkbd[i]:= tkbdn[i] |
162 end |
162 end |
163 end; |
163 end; |
164 |
164 |