Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 350244 | Differences between
and this patch

Collapse All | Expand All

(-)a/hedgewars/uGears.pas (-6 / +9 lines)
Lines 1830-1836 Link Here
1830
    if (x < 4) and (TeamsArray[t] <> nil) then
1830
    if (x < 4) and (TeamsArray[t] <> nil) then
1831
        begin
1831
        begin
1832
            // if team matches current hedgehog team, default to current hedgehog
1832
            // if team matches current hedgehog team, default to current hedgehog
1833
            if (i = 0) and (CurrentHedgehog^.Team = TeamsArray[t]) then hh:= CurrentHedgehog
1833
            if (i = 0) and (CurrentHedgehog <> nil) and (CurrentHedgehog^.Team = TeamsArray[t]) then hh:= CurrentHedgehog
1834
            else 
1834
            else 
1835
                begin
1835
                begin
1836
            // otherwise use the first living hog or the hog amongs the remaining ones indicated by i
1836
            // otherwise use the first living hog or the hog amongs the remaining ones indicated by i
Lines 1847-1858 Link Here
1847
                    inc(j)
1847
                    inc(j)
1848
                    end
1848
                    end
1849
                end;
1849
                end;
1850
        if hh <> nil then Gear:= AddVisualGear(0, 0, vgtSpeechBubble);
1850
        if hh <> nil then
1851
        if Gear <> nil then
1852
            begin
1851
            begin
1853
            Gear^.Hedgehog:= hh;
1852
            Gear:= AddVisualGear(0, 0, vgtSpeechBubble);
1854
            Gear^.Text:= text;
1853
            if Gear <> nil then
1855
            Gear^.FrameTicks:= x
1854
                begin
1855
                Gear^.Hedgehog:= hh;
1856
                Gear^.Text:= text;
1857
                Gear^.FrameTicks:= x
1858
                end
1856
            end
1859
            end
1857
        //else ParseCommand('say ' + text, true)
1860
        //else ParseCommand('say ' + text, true)
1858
        end
1861
        end
(-)a/hedgewars/uGearsRender.pas (-5 / +5 lines)
Lines 186-192 Link Here
186
    if (Gear^.State and gstHHDeath) <> 0 then
186
    if (Gear^.State and gstHHDeath) <> 0 then
187
        begin
187
        begin
188
        DrawSprite(sprHHDeath, ox - 16, oy - 26, Gear^.Pos);
188
        DrawSprite(sprHHDeath, ox - 16, oy - 26, Gear^.Pos);
189
        Tint(HH^.Team^.Clan^.Color);
189
        Tint(HH^.Team^.Clan^.Color shl 8 or $FF);
190
        DrawSprite(sprHHDeath, ox - 16, oy - 26, Gear^.Pos + 8);
190
        DrawSprite(sprHHDeath, ox - 16, oy - 26, Gear^.Pos + 8);
191
        Tint($FF, $FF, $FF, $FF);
191
        Tint($FF, $FF, $FF, $FF);
192
        exit
192
        exit
Lines 353-359 Link Here
353
                                i*DxDy2Angle(CurAmmoGear^.dY, CurAmmoGear^.dX) + hAngle);
353
                                i*DxDy2Angle(CurAmmoGear^.dY, CurAmmoGear^.dX) + hAngle);
354
                            if HatTex^.w > 64 then
354
                            if HatTex^.w > 64 then
355
                                begin
355
                                begin
356
                                Tint(HH^.Team^.Clan^.Color);
356
                                Tint(HH^.Team^.Clan^.Color shl 8 or $FF);
357
                                DrawRotatedTextureF(HatTex, 1.0, -1.0, -6.0, ox, oy, 32, i, 32, 32,
357
                                DrawRotatedTextureF(HatTex, 1.0, -1.0, -6.0, ox, oy, 32, i, 32, 32,
358
                                    i*DxDy2Angle(CurAmmoGear^.dY, CurAmmoGear^.dX) + hAngle);
358
                                    i*DxDy2Angle(CurAmmoGear^.dY, CurAmmoGear^.dX) + hAngle);
359
                                Tint($FF, $FF, $FF, $FF)
359
                                Tint($FF, $FF, $FF, $FF)
Lines 383-389 Link Here
383
                                32);
383
                                32);
384
                            if HatTex^.w > 64 then
384
                            if HatTex^.w > 64 then
385
                                begin
385
                                begin
386
                                Tint(HH^.Team^.Clan^.Color);
386
                                Tint(HH^.Team^.Clan^.Color shl 8 or $FF);
387
                                DrawTextureF(HatTex,
387
                                DrawTextureF(HatTex,
388
                                    1,
388
                                    1,
389
                                    sx,
389
                                    sx,
Lines 705-711 Link Here
705
                    32);
705
                    32);
706
                if HatTex^.w > 64 then
706
                if HatTex^.w > 64 then
707
                    begin
707
                    begin
708
                    Tint(HH^.Team^.Clan^.Color);
708
                    Tint(HH^.Team^.Clan^.Color shl 8 or $FF);
709
                    DrawTextureF(HatTex,
709
                    DrawTextureF(HatTex,
710
                        HatVisibility,
710
                        HatVisibility,
711
                        sx,
711
                        sx,
Lines 729-735 Link Here
729
                    32);
729
                    32);
730
                if HatTex^.w > 64 then
730
                if HatTex^.w > 64 then
731
                    begin
731
                    begin
732
                    Tint(HH^.Team^.Clan^.Color);
732
                    Tint(HH^.Team^.Clan^.Color shl 8 or $FF);
733
                    DrawTextureF(HatTex,
733
                    DrawTextureF(HatTex,
734
                        HatVisibility,
734
                        HatVisibility,
735
                        sx,
735
                        sx,
(-)a/hedgewars/uStore.pas (-1 / +1 lines)
Lines 274-280 Link Here
274
for ii:= Low(TSprite) to High(TSprite) do
274
for ii:= Low(TSprite) to High(TSprite) do
275
    with SpritesData[ii] do
275
    with SpritesData[ii] do
276
        // FIXME - add a sprite attribute
276
        // FIXME - add a sprite attribute
277
        if ((cReducedQuality and rqNoBackground) = 0) or (not (ii in [sprSky, sprSkyL, sprSkyR, sprHorizont, sprHorizontL, sprHorizontR, sprFlake, sprSplash, sprDroplet])) then // FIXME: hack
277
        if ((cReducedQuality and rqNoBackground) = 0) or (not (ii in [sprSky, sprSkyL, sprSkyR, sprHorizont, sprHorizontL, sprHorizontR, sprFlake, sprSplash, sprDroplet]) or (((Theme = 'Snow') or (Theme = 'Christmas')) and (ii = sprFlake))) then // FIXME: hack
278
        begin
278
        begin
279
            if AltPath = ptNone then
279
            if AltPath = ptNone then
280
                if ii in [sprHorizontL, sprHorizontR, sprSkyL, sprSkyR] then // FIXME: hack
280
                if ii in [sprHorizontL, sprHorizontR, sprSkyL, sprSkyR] then // FIXME: hack
(-)a/hedgewars/uWorld.pas (-1 / +1 lines)
Lines 742-748 Link Here
742
      highlight:= bShowFinger and (CurrentTeam = TeamsArray[t]) and ((RealTicks mod 1000) < 500);
742
      highlight:= bShowFinger and (CurrentTeam = TeamsArray[t]) and ((RealTicks mod 1000) < 500);
743
743
744
      if highlight then
744
      if highlight then
745
         Tint(Clan^.Color);
745
         Tint(Clan^.Color shl 8 or $FF);
746
746
747
      // draw name
747
      // draw name
748
      DrawTexture(-NameTagTex^.w - 16, cScreenHeight + DrawHealthY, NameTagTex);
748
      DrawTexture(-NameTagTex^.w - 16, cScreenHeight + DrawHealthY, NameTagTex);

Return to bug 350244