hedgewars/uGears.pas
changeset 2042 905c554d62e6
parent 2031 b6f3e56fb100
child 2045 b0588498bc3a
--- a/hedgewars/uGears.pas	Sat May 09 11:57:47 2009 +0000
+++ b/hedgewars/uGears.pas	Mon May 11 18:56:55 2009 +0000
@@ -53,8 +53,7 @@
 			Z: Longword;
 			IntersectGear: PGear;
 			TriggerId: Longword;
-			uid: Longword;
-            Text: shortstring;
+			uid: Longword
 			end;
 
 function  AddGear(X, Y: LongInt; Kind: TGearType; State: Longword; dX, dY: hwFloat; Timer: LongWord): PGear;
@@ -163,7 +162,6 @@
 			@doStepBallgun,
 			@doStepBomb,
 			@doStepRCPlane,
-			@doStepSpeechBubble,
 			@doStepSniperRifleShot
 			);
 
@@ -257,9 +255,6 @@
                 Result^.Timer:= 1500;
                 Result^.Z:= 2002;
                 end;
-   gtSpeechBubble: begin
-                Result^.Z:= 2003;
-                end;
        gtGrave: begin
                 Result^.Radius:= 10;
                 Result^.Elasticity:= _0_6;
@@ -654,7 +649,7 @@
           for i:= 0 to cMaxHHIndex do
               with Hedgehogs[i] do
                   begin
-                  if (SpeechGear <> nil) then DeleteGear(SpeechGear);  // remove to restore persisting beyond end of turn. Tiy says was too much of a gameplay issue
+                  if (SpeechGear <> nil) then DeleteVisualGear(SpeechGear);  // remove to restore persisting beyond end of turn. Tiy says was too much of a gameplay issue
                   if (Gear <> nil) then
                      if (GameFlags and gfInvulnerable) = 0 then
                         Gear^.Invulnerable:= false;
@@ -1295,8 +1290,6 @@
        
        gtHealthTag: if Gear^.Tex <> nil then DrawCentered(hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, Gear^.Tex);
 
-       gtSpeechBubble: if Gear^.Tex <> nil then DrawCentered(hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, Gear^.Tex);
-           
            gtGrave: DrawSurfSprite(hwRound(Gear^.X) + WorldDx - 16, hwRound(Gear^.Y) + WorldDy - 16, 32, (GameTicks shr 7) and 7, PHedgehog(Gear^.Hedgehog)^.Team^.GraveTex);
              
              gtUFO: DrawSprite(sprUFO, hwRound(Gear^.X) - 16 + WorldDx, hwRound(Gear^.Y) - 16 + WorldDy, (GameTicks shr 7) mod 4);