# HG changeset patch # User Henek # Date 1289147077 -10800 # Node ID 49ad7bea4a336e1e61743fa1b5620782f2222413 # Parent 207cd9358876ee1d221e152643ba0cfd3f4fc283 renaming gtAmmo_Bomb and gtAmmo_Grenade diff -r 207cd9358876 -r 49ad7bea4a33 hedgewars/GSHandlers.inc --- a/hedgewars/GSHandlers.inc Sun Nov 07 18:39:34 2010 +0300 +++ b/hedgewars/GSHandlers.inc Sun Nov 07 19:24:37 2010 +0300 @@ -352,7 +352,7 @@ dec(Gear^.Timer); if Gear^.Timer = 1000 then // might need adjustments case Gear^.Kind of - gtAmmo_Bomb: makeHogsWorry(Gear^.X, Gear^.Y, 50); + gtBomb: makeHogsWorry(Gear^.X, Gear^.Y, 50); gtClusterBomb: makeHogsWorry(Gear^.X, Gear^.Y, 20); gtWatermelon: makeHogsWorry(Gear^.X, Gear^.Y, 75); gtHellishBomb: makeHogsWorry(Gear^.X, Gear^.Y, 90); @@ -376,7 +376,7 @@ if Gear^.Timer = 0 then begin case Gear^.Kind of - gtAmmo_Bomb: doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 50, EXPLAutoSound); + gtBomb: doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 50, EXPLAutoSound); gtBall: doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 40, EXPLAutoSound); gtClusterBomb: begin @@ -509,7 +509,7 @@ end; //////////////////////////////////////////////////////////////////////////////// -procedure doStepGrenade(Gear: PGear); +procedure doStepShell(Gear: PGear); begin AllInactive := false; Gear^.dX := Gear^.dX + cWindSpeed; diff -r 207cd9358876 -r 49ad7bea4a33 hedgewars/GearDrawing.inc --- a/hedgewars/GearDrawing.inc Sun Nov 07 18:39:34 2010 +0300 +++ b/hedgewars/GearDrawing.inc Sun Nov 07 19:24:37 2010 +0300 @@ -694,7 +694,7 @@ x:= hwRound(Gear^.X) + WorldDx; y:= hwRound(Gear^.Y) + WorldDy; case Gear^.Kind of - gtAmmo_Bomb: DrawRotated(sprBomb, x, y, 0, Gear^.DirAngle); + gtBomb: DrawRotated(sprBomb, x, y, 0, Gear^.DirAngle); gtGasBomb: DrawRotated(sprCheese, x, y, 0, Gear^.DirAngle); gtMolotov: DrawRotated(sprMolotov, x, y, 0, Gear^.DirAngle); @@ -718,7 +718,7 @@ gtHedgehog: DrawHH(Gear, x, y); - gtAmmo_Grenade: DrawRotated(sprGrenade, x, y, 0, DxDy2Angle(Gear^.dY, Gear^.dX)); + gtShell: DrawRotated(sprBazookaShell, x, y, 0, DxDy2Angle(Gear^.dY, Gear^.dX)); gtGrave: begin DrawTextureF(PHedgehog(Gear^.Hedgehog)^.Team^.GraveTex, 1, x, y, (GameTicks shr 7+Gear^.uid) and 7, 1, 32, 32); diff -r 207cd9358876 -r 49ad7bea4a33 hedgewars/HHHandlers.inc --- a/hedgewars/HHHandlers.inc Sun Nov 07 18:39:34 2010 +0300 +++ b/hedgewars/HHHandlers.inc Sun Nov 07 19:24:37 2010 +0300 @@ -183,11 +183,11 @@ if Ammoz[CurAmmoType].Ammo.AttackVoice <> sndNone then PlaySound(Ammoz[CurAmmoType].Ammo.AttackVoice, CurrentTeam^.voicepack); case CurAmmoType of - amGrenade: FollowGear:= AddGear(hwRound(lx), hwRound(ly), gtAmmo_Bomb, 0, xx*Power/cPowerDivisor, yy*Power/cPowerDivisor, CurWeapon^.Timer); + amGrenade: FollowGear:= AddGear(hwRound(lx), hwRound(ly), gtBomb, 0, xx*Power/cPowerDivisor, yy*Power/cPowerDivisor, CurWeapon^.Timer); amMolotov: FollowGear:= AddGear(hwRound(lx), hwRound(ly), gtMolotov, 0, xx*Power/cPowerDivisor, yy*Power/cPowerDivisor, 0); amClusterBomb: FollowGear:= AddGear(hwRound(lx), hwRound(ly), gtClusterBomb, 0, xx*Power/cPowerDivisor, yy*Power/cPowerDivisor, CurWeapon^.Timer); - amGasBomb: FollowGear:= AddGear(hwRound(lx), hwRound(ly), gtGasBomb, 0, xx*Power/cPowerDivisor, yy*Power/cPowerDivisor, CurWeapon^.Timer); - amBazooka: FollowGear:= AddGear(hwRound(lx), hwRound(ly), gtAmmo_Grenade, 0, xx*Power/cPowerDivisor, yy*Power/cPowerDivisor, 0); + amGasBomb: FollowGear:= AddGear(hwRound(lx), hwRound(ly), gtGasBomb, 0, xx*Power/cPowerDivisor, yy*Power/cPowerDivisor, CurWeapon^.Timer); + amBazooka: FollowGear:= AddGear(hwRound(lx), hwRound(ly), gtShell, 0, xx*Power/cPowerDivisor, yy*Power/cPowerDivisor, 0); amBee: FollowGear:= AddGear(hwRound(lx), hwRound(ly), gtBee, 0, xx*Power/cPowerDivisor, yy*Power/cPowerDivisor, 0); amShotgun: begin PlaySound(sndShotgunReload); diff -r 207cd9358876 -r 49ad7bea4a33 hedgewars/uConsts.pas --- a/hedgewars/uConsts.pas Sun Nov 07 18:39:34 2010 +0300 +++ b/hedgewars/uConsts.pas Sun Nov 07 19:24:37 2010 +0300 @@ -43,7 +43,7 @@ ptLocale, ptAmmoMenu, ptHedgehog, ptVoices, ptHats, ptFlags, ptMissionMaps); TSprite = (sprWater, sprCloud, sprBomb, sprBigDigit, sprFrame, - sprLag, sprArrow, sprGrenade, sprTargetP, sprBee, + sprLag, sprArrow, sprBazookaShell, sprTargetP, sprBee, sprSmokeTrace, sprRopeHook, sprExplosion50, sprMineOff, sprMineOn, sprMineDead, sprCase, sprFAid, sprDynamite, sprPower, sprClusterBomb, sprClusterParticle, sprFlame, sprHorizont, @@ -79,7 +79,7 @@ ); // Gears that interact with other Gears and/or Land - TGearType = (gtAmmo_Bomb, gtHedgehog, gtAmmo_Grenade, gtGrave, gtBee, // 4 + TGearType = (gtBomb, gtHedgehog, gtShell, gtGrave, gtBee, // 4 gtShotgunShot, gtPickHammer, gtRope, gtMine, gtCase, // 9 gtDEagleShot, gtDynamite, gtClusterBomb, gtCluster, gtShover, // 14 gtFlame, gtFirePunch, gtATStartGame, gtATSmoothWindCh, // 18 @@ -521,8 +521,8 @@ Width: 65; Height: 65; imageWidth: 0; imageHeight: 0; saveSurf: false; priority: tpLowest; getDimensions: false; getImageDimensions: true),// sprLag (FileName: 'Arrow'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil; Width: 16; Height: 16; imageWidth: 0; imageHeight: 0; saveSurf: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprCursor - (FileName: 'Grenade'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil; - Width: 16; Height: 16; imageWidth: 0; imageHeight: 0; saveSurf: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprGrenade + (FileName:'BazookaShell'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil; + Width: 16; Height: 16; imageWidth: 0; imageHeight: 0; saveSurf: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprBazookaShell (FileName: 'Targetp'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil; Width: 32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprTargetP (FileName: 'Bee'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil; diff -r 207cd9358876 -r 49ad7bea4a33 hedgewars/uGears.pas --- a/hedgewars/uGears.pas Sun Nov 07 18:39:34 2010 +0300 +++ b/hedgewars/uGears.pas Sun Nov 07 19:24:37 2010 +0300 @@ -155,7 +155,7 @@ const doStepHandlers: array[TGearType] of TGearStepProcedure = ( @doStepBomb, @doStepHedgehog, - @doStepGrenade, + @doStepShell, @doStepGrave, @doStepBee, @doStepShotgunShot, @@ -292,7 +292,7 @@ end; case Kind of - gtAmmo_Bomb, + gtBomb, gtClusterBomb, gtGasBomb: begin gear^.ImpactSound:= sndGrenadeImpact; @@ -325,7 +325,7 @@ if PHedgehog(gear^.Hedgehog)^.BotLevel > 0 then PHedgehog(gear^.Hedgehog)^.Effects[heResurrectable] := true; end; -gtAmmo_Grenade: begin // bazooka + gtShell: begin gear^.Radius:= 4; end; gtGrave: begin diff -r 207cd9358876 -r 49ad7bea4a33 share/hedgewars/Data/Maps/TrophyRace/map.lua --- a/share/hedgewars/Data/Maps/TrophyRace/map.lua Sun Nov 07 18:39:34 2010 +0300 +++ b/share/hedgewars/Data/Maps/TrophyRace/map.lua Sun Nov 07 19:24:37 2010 +0300 @@ -169,7 +169,7 @@ SetHealth(worsthog, 0) --Place a grenade to make inactive slowest hog active x, y = GetGearPosition(worsthog) - AddGear(x, y, gtAmmo_Grenade, 0, 0, 0, 0) + AddGear(x, y, gtShell, 0, 0, 0, 0) worsttime = 0 worsthog = nil end