sheepy-clone: comparison hedgewars/uGears.pas

equal deleted inserted replaced

-:d24257910f8d
+:aaefa587e277
 function  GearByUID(uid : Longword) : PGear;
 procedure doStepDrowningGear(Gear: PGear);
 implementation
 uses uStore, uSound, uTeams, uRandom, uCollisions, uIO, uLandGraphics,
-uLocale, uAI, uAmmos, uStats, uVisualGears, uScript, GLunit, uMobile, uVariables,
+uLocale, uAI, uAmmos, uStats, uVisualGears, uScript, GLunit, uVariables,
 uCommands, uUtils, uTextures, uRenderUtils, uGearsRender, uCaptions, uDebug, uLandTexture,
 uGearsHedgehog, uGearsUtils, uGearsList, uGearsHandlers, uGearsHandlersRope;
 var skipFlag: boolean;
 inc(tmp, 5);
 if (GameFlags and gfResetHealth) <> 0 then
 dec(Gear^.Hedgehog^.InitialHealth, 5)
 end
 end;
 if tmp > 0 then
 begin
 inc(Gear^.Damage, min(tmp, max(0,Gear^.Health - 1 - Gear^.Damage)));
 HHHurt(Gear^.Hedgehog, dsPoison);
 end
 end;
 if curHandledGear^.Message and gmDelete <> 0 then
 DeleteGear(curHandledGear)
 else
 begin
 if curHandledGear^.Message and gmRemoveFromList <> 0 then
 begin
 RemoveGearFromList(curHandledGear);
 // since I can't think of any good reason this would ever be separate from a remove from list, going to keep it inside this block
 if curHandledGear^.Message and gmAddToList <> 0 then InsertGearToList(curHandledGear);
 curHandledGear^.Message:= (curHandledGear^.Message and (not (gmRemoveFromList or gmAddToList)))
 dec(delay);
 if delay = 0 then
 inc(step)
 end;
 stChDmg:
 if CheckNoDamage then
 inc(step)
 else
 step:= stDelay;
 stSweep:
 if SweepDirty then
 begin
 SetAllToActive;
 step:= stChDmg
 end
 else
 inc(step);
 stTurnReact:
 begin
 if (not bBetweenTurns) and (not isInMultiShoot) then
 begin
 uStats.TurnReaction;
 inc(step)
 end
 else
 inc(step, 2);
 end;
 stAfterDelay:
 begin
 if delay = 0 then
 delay:= cInactDelay
 else
 begin
 SuddenDeath:= true;
 if cHealthDecrease <> 0 then
 begin
 SuddenDeathDmg:= true;
 // flash
 ScreenFade:= sfFromWhite;
 ScreenFadeValue:= sfMax;
 ScreenFadeSpeed:= 1;
 ChangeToSDClouds;
 ChangeToSDFlakes;
 glClearColor(SDSkyColor.r * (SDTint/255) / 255, SDSkyColor.g * (SDTint/255) / 255, SDSkyColor.b * (SDTint/255) / 255, 0.99);
 Ammoz[amTardis].SkipTurns:= 9999;
 Ammoz[amTardis].Probability:= 0;
 t^.Health:= t^.Hedgehog^.InitialHealth;
 RenderHealth(t^.Hedgehog^);
 end;
 t:= t^.NextGear
 end;
 if ((GameFlags and gfResetWeps) <> 0) and (not PlacingHogs) then
 ResetWeapons;
 if (GameFlags and gfResetHealth) <> 0 then
 for i:= 0 to Pred(TeamsCount) do
 gtMine,
 gtSMine,
 gtKnife,
 gtCase,
 gtTarget,
-gtExplosives,
+gtExplosives: begin//,
-gtStructure: begin
+//            gtStructure: begin
 //addFileLog('ShotgunShot radius: ' + inttostr(Gear^.Radius) + ', t^.Radius = ' + inttostr(t^.Radius) + ', distance = ' + inttostr(dist) + ', dmg = ' + inttostr(dmg));
 dmg:= 0;
 r:= Gear^.Radius + t^.Radius;
 dx:= Gear^.X-t^.X;
 dx.isNegative:= false;
 Gear:= t^.ar[i];
 tmpDmg:= ModifyDamage(Damage, Gear);
 if (Gear^.State and gstNoDamage) = 0 then
 begin
 if (Ammo^.Kind = gtDEagleShot) or (Ammo^.Kind = gtSniperRifleShot) then
 begin
 VGear := AddVisualGear(hwround(Ammo^.X), hwround(Ammo^.Y), vgtBulletHit);
 if VGear <> nil then
 VGear^.Angle := DxDy2Angle(-Ammo^.dX, Ammo^.dY);
 end;
 gtMine,
 gtSMine,
 gtKnife,
 gtTarget,
 gtCase,
-gtExplosives,
+gtExplosives: //,
-gtStructure:
+//gtStructure:
 begin
 if (Ammo^.Kind = gtDrill) then
 begin
 Ammo^.Timer:= 0;
 exit;
 end;
 ApplyDamage(Gear, Ammo^.Hedgehog, tmpDmg, dsShove)
 end
 else
 Gear^.State:= Gear^.State or gstWinner;
 if (Gear^.Kind = gtExplosives) and (Ammo^.Kind = gtBlowtorch) then
 begin
 if (Ammo^.Hedgehog^.Gear <> nil) then
 Ammo^.Hedgehog^.Gear^.State:= (Ammo^.Hedgehog^.Gear^.State and (not gstNotKickable));
 ApplyDamage(Gear, Ammo^.Hedgehog, tmpDmg * 100, dsUnknown); // crank up damage for explosives + blowtorch
 end;
 begin
 ar[Count]:= @Hedgehogs[i];
 inc(Count)
 end;
 end;
-// unC0Rr, while it is true user can watch value on map screen, IMO this (and check above) should be enforced in UI
-// - is there a good place to put values for the different widgets to check?  Right now they are kind of disconnected.
-//it would be nice if divide teams, forts mode and hh per map could all be checked by the team widget, or maybe disable start button
-TryDo(Count <= MaxHedgehogs, 'Too many hedgehogs for this map! (max # is ' + inttostr(MaxHedgehogs) + ')', true);
 while (Count > 0) do
 begin
 i:= GetRandom(Count);
 if PlacingHogs then
 ar[i]^.Unplaced:= true
 begin
 r:= r*r;
 s:= 0;
 SetLength(GearsNearArray, s);
 t := GearsList;
 while t <> nil do
 begin
 if (t^.Kind = Kind)
 and ((X - t^.X)*(X - t^.X) + (Y - t^.Y)*(Y-t^.Y) < int2hwFloat(r)) then
 begin
 inc(s);
 SetLength(GearsNearArray, s);
 GearsNearArray[s - 1] := t;
 function SpawnFakeCrateAt(x, y: LongInt; crate: TCrateType; explode: boolean; poison: boolean): PGear;
 begin
 FollowGear := AddGear(x, y, gtCase, 0, _0, _0, 0);
 cCaseFactor := 0;
 FollowGear^.Pos := posCaseDummy;
 if explode then
 FollowGear^.Pos := FollowGear^.Pos + posCaseExplode;
 if poison then
 FollowGear^.Pos := FollowGear^.Pos + posCasePoison;
 if (x < 4) and (TeamsArray[t] <> nil) then
 begin
 // if team matches current hedgehog team, default to current hedgehog
 if (i = 0) and (CurrentHedgehog <> nil) and (CurrentHedgehog^.Team = TeamsArray[t]) then
 hh:= CurrentHedgehog
 else
 begin
 // otherwise use the first living hog or the hog amongs the remaining ones indicated by i
 j:= 0;
 c:= 0;
 while (j <= cMaxHHIndex) and (hh = nil) do
 hh:= @TeamsArray[t]^.Hedgehogs[j]
 end;
 inc(j)
 end
 end;
 if hh <> nil then
 begin
 Gear:= AddVisualGear(0, 0, vgtSpeechBubble);
 if Gear <> nil then
 begin
 Gear^.Hedgehog:= hh;
 @doStepHammerHit,
 @doStepResurrector,
 @doStepNapalmBomb,
 @doStepSnowball,
 @doStepSnowflake,
-@doStepStructure,
+//@doStepStructure,
 @doStepLandGun,
 @doStepTardis,
 @doStepIceGun,
 @doStepAddAmmo,
 @doStepGenericFaller,

branch	webgl
changeset 8330	aaefa587e277
parent 8099	a7f02b902b6f
parent 8204	9a6030d96273
child 8444	75db7bb8dce8