hedgewars/uWorld.pas
changeset 2856 cc70797a0b75
parent 2855 7e6adeb57427
child 2857 768dfbe276a5
equal deleted inserted replaced
2855:7e6adeb57427 2856:cc70797a0b75
    88          cp:= ClansArray[0];
    88          cp:= ClansArray[0];
    89          ClansArray[0]:= ClansArray[t];
    89          ClansArray[0]:= ClansArray[t];
    90          ClansArray[t]:= cp;
    90          ClansArray[t]:= cp;
    91          ClansArray[t]^.ClanIndex:= t;
    91          ClansArray[t]^.ClanIndex:= t;
    92          ClansArray[0]^.ClanIndex:= 0;
    92          ClansArray[0]^.ClanIndex:= 0;
       
    93          if (LocalClan = t) then LocalClan:= 0
       
    94          else if (LocalClan = 0) then LocalClan:= t
    93          end;
    95          end;
    94       end;
    96       end;
    95    CurrentTeam:= ClansArray[0]^.Teams[0];
    97    CurrentTeam:= ClansArray[0]^.Teams[0];
    96    end;
    98    end;
    97 
    99 
   137    else
   139    else
   138        if AMxShift < 210 then inc(AMxShift, MENUSPEED);
   140        if AMxShift < 210 then inc(AMxShift, MENUSPEED);
   139    end;
   141    end;
   140 if (CurrentTeam <> nil) and (CurrentHedgehog <> nil) and (not CurrentTeam^.ExtDriven) and (CurrentHedgehog^.BotLevel = 0) then
   142 if (CurrentTeam <> nil) and (CurrentHedgehog <> nil) and (not CurrentTeam^.ExtDriven) and (CurrentHedgehog^.BotLevel = 0) then
   141    Ammo:= CurrentHedgehog^.Ammo
   143    Ammo:= CurrentHedgehog^.Ammo
   142 else 
   144 else if (LocalAmmo <> -1) then
   143    Ammo:= GetAmmoByNum(LocalAmmo);
   145    Ammo:= GetAmmoByNum(LocalAmmo);
   144 Slot:= 0;
   146 Slot:= 0;
   145 Pos:= -1;
   147 Pos:= -1;
   146 if Ammo = nil then exit;
   148 if Ammo = nil then exit;
   147 SlotsNum:= 0;
   149 SlotsNum:= 0;