sheepy-clone: comparison hedgewars/uGears.pas

equal deleted inserted replaced

-:8054d9d775fd
+:2759212a27de
 *
 * Note: Gears that do not have an effect on the game but are just visual
 *       effects are called "Visual Gears" and defined in the respective unit!
 *)
 interface
-uses uConsts, uFloat, uTypes;
+uses uConsts, uFloat, uTypes, uChat;
 procedure initModule;
 procedure freeModule;
 function  SpawnCustomCrateAt(x, y: LongInt; crate: TCrateType; content, cnt: Longword): PGear;
 function  SpawnFakeCrateAt(x, y: LongInt; crate: TCrateType; explode: boolean; poison: boolean ): PGear;
 procedure FreeGearsList;
 procedure AddMiscGears;
 procedure AssignHHCoords;
 function  GearByUID(uid : Longword) : PGear;
 implementation
-uses uStore, uSound, uTeams, uRandom, uIO, uLandGraphics, {$IFDEF SDL2}uTouch,{$ENDIF}
+uses uStore, uSound, uTeams, uRandom, uIO, uLandGraphics,
+{$IFDEF USE_TOUCH_INTERFACE}uTouch,{$ENDIF}
 uLocale, uAmmos, uStats, uVisualGears, uScript, uVariables,
 uCommands, uUtils, uTextures, uRenderUtils, uGearsRender, uCaptions, uDebug, uLandTexture,
 uGearsHedgehog, uGearsUtils, uGearsList, uGearsHandlersRope
 , uVisualGearsList, uGearsHandlersMess, uAI;
 if (Gear^.Kind = gtHedgehog) and (((GameFlags and gfInfAttack) = 0) or ((Gear^.dX.QWordValue < _0_000004.QWordValue)
 and (Gear^.dY.QWordValue < _0_000004.QWordValue))) then
 begin
 if (not isInMultiShoot) then
 inc(Gear^.Damage, Gear^.Karma);
-if ((Gear^.Damage <> 0) and (not Gear^.Invulnerable)) then
+if (Gear^.Damage <> 0) and ((Gear^.Hedgehog^.Effects[heInvulnerable] = 0)) then
 begin
 CheckNoDamage:= false;
 dmg:= Gear^.Damage;
 if Gear^.Health < dmg then
 procedure ProcessGears;
 var t: PGear;
 i, AliveCount: LongInt;
 s: shortstring;
-begin
+prevtime: LongWord;
+begin
+prevtime:= TurnTimeLeft;
 ScriptCall('onGameTick');
 if GameTicks mod 20 = 0 then ScriptCall('onGameTick20');
 if GameTicks = NewTurnTick then
 begin
 ScriptCall('onNewTurn');
-{$IFDEF SDL2}
+{$IFDEF USE_TOUCH_INTERFACE}
 uTouch.NewTurnBeginning();
 {$ENDIF}
 end;
 PrvInactive:= AllInactive;
 end
 end;
 if TurnTimeLeft > 0 then
 if CurrentHedgehog^.Gear <> nil then
-if ((CurrentHedgehog^.Gear^.State and gstAttacking) = 0) and
+if (((CurrentHedgehog^.Gear^.State and gstAttacking) = 0)
-(not (isInMultiShoot and (CurrentHedgehog^.CurAmmoType in [amShotgun, amDEagle, amSniperRifle]))) then
+or (Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerWhileAttacking <> 0))
+and not(isInMultiShoot and ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerInMultiShoot) <> 0)) then
+//(CurrentHedgehog^.CurAmmoType in [amShotgun, amDEagle, amSniperRifle])
 begin
 if (TurnTimeLeft = 5000)
 and (cHedgehogTurnTime >= 10000)
 and (not PlacingHogs)
 and (CurrentHedgehog^.Gear <> nil)
 if (not CurrentTeam^.ExtDriven) or CurrentTeam^.hasGone then
 inc(hiTicks) // we do not recieve a message for this
 end;
 AddRandomness(CheckSum);
+TurnClockActive:= prevtime <> TurnTimeLeft;
 inc(GameTicks)
 end;
 //Purpose, to reset all transient attributes toggled by a utility and clean up various gears and effects at end of turn
 //If any of these are set as permanent toggles in the frontend, that needs to be checked and skipped here.
 *)
 if (Gear <> nil) then
 begin
 if (GameFlags and gfInvulnerable) = 0 then
-Gear^.Invulnerable:= false;
+Gear^.Hedgehog^.Effects[heInvulnerable]:= 0;
 end;
 end;
 t:= GearsList;
 while t <> nil do
 begin
 Dispose(t)
 end;
 end;
 procedure AddMiscGears;
-var i,rx, ry: Longword;
+var p,i,j,rx, ry: Longword;
 rdx, rdy: hwFloat;
 Gear: PGear;
 temp: Longword;
 begin
 AddGear(0, 0, gtATStartGame, 0, _0, _0, 2000);
 if (GameFlags and gfVampiric) <> 0 then
 cVampiric:= true;
 Gear:= GearsList;
 if (GameFlags and gfInvulnerable) <> 0 then
-while Gear <> nil do
+for p:= 0 to Pred(ClansCount) do
-begin
+with ClansArray[p]^ do
-Gear^.Invulnerable:= true;  // this is only checked on hogs right now, so no need for gear type check
+for j:= 0 to Pred(TeamsNumber) do
-Gear:= Gear^.NextGear
+with Teams[j]^ do
-end;
+for i:= 0 to cMaxHHIndex do
+with Hedgehogs[i] do
+Effects[heInvulnerable]:= 1;
 if (GameFlags and gfLaserSight) <> 0 then
 cLaserSighting:= true;
 if (GameFlags and gfArtillery) <> 0 then
 end;
 snowRight:= max(LAND_WIDTH,4096)+512;
 snowLeft:= -(snowRight-LAND_WIDTH);
-if (not hasBorder) and ((Theme = 'Snow') or (Theme = 'Christmas')) then
+if (not hasBorder) and cSnow then
 for i:= vobCount * Longword(max(LAND_WIDTH,4096)) div 2048 downto 1 do
 AddGear(LongInt(GetRandom(snowRight - snowLeft)) + snowLeft, LAND_HEIGHT + LongInt(GetRandom(750)) - 1300, gtFlake, 0, _0, _0, 0);
 end;
 procedure AssignHHCoords;
 text:= copy(s, 4, Length(s) - 1)
 else if x < 4 then
 text:= copy(s, 3, Length(s) - 1)
 else text:= copy(s, 2, Length(s) - 1);
+if text = '' then text:= '...';
 (*
 if CheckNoTeamOrHH then
 begin
 ParseCommand('say ' + text, true);
 exit
 if Gear <> nil then
 begin
 Gear^.Hedgehog:= hh;
 Gear^.Text:= text;
 Gear^.FrameTicks:= x
-end
+end;
+//ParseCommand('/say [' + hh^.Name + '] '+text, true)
+AddChatString(#1+'[' + HH^.Name + '] '+text);
 end
-//else ParseCommand('say ' + text, true)
 end
 else if (x >= 4) then
 begin
 SpeechType:= x-3;
 SpeechText:= text

branch	webgl
changeset 9950	2759212a27de
parent 9521	8054d9d775fd
parent 9818	ff07ac765f45
child 9954	bf51bc7e2808