equal
deleted
inserted
replaced
539 if Gear^.Active then |
539 if Gear^.Active then |
540 begin |
540 begin |
541 if Gear^.RenderTimer and (Gear^.Timer > 500) and ((Gear^.Timer mod 1000) = 0) then |
541 if Gear^.RenderTimer and (Gear^.Timer > 500) and ((Gear^.Timer mod 1000) = 0) then |
542 begin |
542 begin |
543 if Gear^.Tex <> nil then FreeTexture(Gear^.Tex); |
543 if Gear^.Tex <> nil then FreeTexture(Gear^.Tex); |
544 Gear^.Tex:= RenderStringTex(inttostr(Gear^.Timer div 1000), $FFFFFFFF, fntSmall); |
544 Gear^.Tex:= RenderStringTex(inttostr(Gear^.Timer div 1000), cWhiteColor, fntSmall); |
545 end; |
545 end; |
546 Gear^.doStep(Gear); |
546 Gear^.doStep(Gear); |
547 end |
547 end |
548 end; |
548 end; |
549 |
549 |
600 end; |
600 end; |
601 stHealth: begin |
601 stHealth: begin |
602 if (TotalRounds = cSuddenDTurns) and (cHealthDecrease = 0) then |
602 if (TotalRounds = cSuddenDTurns) and (cHealthDecrease = 0) then |
603 begin |
603 begin |
604 cHealthDecrease:= 5; |
604 cHealthDecrease:= 5; |
605 AddCaption(trmsg[sidSuddenDeath], $FFFFFF, capgrpGameState); |
605 AddCaption(trmsg[sidSuddenDeath], cWhiteColor, capgrpGameState); |
606 playSound(sndSuddenDeath, false, nil); |
606 playSound(sndSuddenDeath, false, nil); |
607 end; |
607 end; |
608 |
608 |
609 if (cHealthDecrease = 0) |
609 if (cHealthDecrease = 0) |
610 or bBetweenTurns |
610 or bBetweenTurns |
1884 case t of |
1884 case t of |
1885 0..6: begin |
1885 0..6: begin |
1886 FollowGear:= AddGear(0, 0, gtCase, 0, _0, _0, 0); |
1886 FollowGear:= AddGear(0, 0, gtCase, 0, _0, _0, 0); |
1887 FollowGear^.Health:= 25; |
1887 FollowGear^.Health:= 25; |
1888 FollowGear^.Pos:= posCaseHealth; |
1888 FollowGear^.Pos:= posCaseHealth; |
1889 AddCaption(GetEventString(eidNewHealthPack), $FFFFFF, capgrpGameState); |
1889 AddCaption(GetEventString(eidNewHealthPack), cWhiteColor, capgrpGameState); |
1890 end; |
1890 end; |
1891 7..13: begin |
1891 7..13: begin |
1892 t:= 0; |
1892 t:= 0; |
1893 for i:= Low(TAmmoType) to High(TAmmoType) do |
1893 for i:= Low(TAmmoType) to High(TAmmoType) do |
1894 if (Ammoz[i].Ammo.Propz and ammoprop_Utility) = 0 then |
1894 if (Ammoz[i].Ammo.Propz and ammoprop_Utility) = 0 then |
1906 if (Ammoz[i].Ammo.Propz and ammoprop_Utility) = 0 then |
1906 if (Ammoz[i].Ammo.Propz and ammoprop_Utility) = 0 then |
1907 dec(t, Ammoz[i].Probability) |
1907 dec(t, Ammoz[i].Probability) |
1908 end; |
1908 end; |
1909 FollowGear^.Pos:= posCaseAmmo; |
1909 FollowGear^.Pos:= posCaseAmmo; |
1910 FollowGear^.State:= Longword(i); |
1910 FollowGear^.State:= Longword(i); |
1911 AddCaption(GetEventString(eidNewAmmoPack), $FFFFFF, capgrpGameState); |
1911 AddCaption(GetEventString(eidNewAmmoPack), cWhiteColor, capgrpGameState); |
1912 end |
1912 end |
1913 end; |
1913 end; |
1914 14..19: begin |
1914 14..19: begin |
1915 t:= 0; |
1915 t:= 0; |
1916 for i:= Low(TAmmoType) to High(TAmmoType) do |
1916 for i:= Low(TAmmoType) to High(TAmmoType) do |
1929 if (Ammoz[i].Ammo.Propz and ammoprop_Utility) <> 0 then |
1929 if (Ammoz[i].Ammo.Propz and ammoprop_Utility) <> 0 then |
1930 dec(t, Ammoz[i].Probability) |
1930 dec(t, Ammoz[i].Probability) |
1931 end; |
1931 end; |
1932 FollowGear^.Pos:= posCaseUtility; |
1932 FollowGear^.Pos:= posCaseUtility; |
1933 FollowGear^.State:= Longword(i); |
1933 FollowGear^.State:= Longword(i); |
1934 AddCaption(GetEventString(eidNewUtilityPack), $FFFFFF, capgrpGameState); |
1934 AddCaption(GetEventString(eidNewUtilityPack), cWhiteColor, capgrpGameState); |
1935 end |
1935 end |
1936 end; |
1936 end; |
1937 end; |
1937 end; |
1938 // handles case of no ammo or utility crates - considered also placing booleans in uAmmos and altering probabilities |
1938 // handles case of no ammo or utility crates - considered also placing booleans in uAmmos and altering probabilities |
1939 if (FollowGear <> nil) then |
1939 if (FollowGear <> nil) then |