# HG changeset patch # User nemo # Date 1507397038 14400 # Node ID 308846e051549fc548c4a2e22baa592821f87f2f # Parent 2e0a38566178cbc7bd1feeb4a88ccff78eec680d extend overridable graphics/sounds to 8 of each, for lua scripters who really like having their own sprites/sounds. these should not be used in the engine. diff -r 2e0a38566178 -r 308846e05154 hedgewars/uSound.pas --- a/hedgewars/uSound.pas Sat Oct 07 19:11:25 2017 +0200 +++ b/hedgewars/uSound.pas Sat Oct 07 13:23:58 2017 -0400 @@ -270,7 +270,15 @@ (FileName: 'countdown4.ogg'; Path: ptSounds; AltPath: ptNone),// sndCountdown4 (FileName: 'rubberduck_drop.ogg'; Path: ptSounds; AltPath: ptNone),// sndDuckDrop (FileName: 'rubberduck_water.ogg'; Path: ptSounds; AltPath: ptNone),// sndDuckWater - (FileName: 'rubberduck_die.ogg'; Path: ptSounds; AltPath: ptNone) // sndDuckDie + (FileName: 'rubberduck_die.ogg'; Path: ptSounds; AltPath: ptNone),// sndDuckDie + (FileName: 'custom1.ogg'; Path: ptSounds; AltPath: ptNone),// sndCustom1 + (FileName: 'custom2.ogg'; Path: ptSounds; AltPath: ptNone),// sndCustom2 + (FileName: 'custom3.ogg'; Path: ptSounds; AltPath: ptNone),// sndCustom3 + (FileName: 'custom4.ogg'; Path: ptSounds; AltPath: ptNone),// sndCustom4 + (FileName: 'custom5.ogg'; Path: ptSounds; AltPath: ptNone),// sndCustom5 + (FileName: 'custom6.ogg'; Path: ptSounds; AltPath: ptNone),// sndCustom6 + (FileName: 'custom7.ogg'; Path: ptSounds; AltPath: ptNone),// sndCustom7 + (FileName: 'custom8.ogg'; Path: ptSounds; AltPath: ptNone) // sndCustom8 ); diff -r 2e0a38566178 -r 308846e05154 hedgewars/uTypes.pas --- a/hedgewars/uTypes.pas Sat Oct 07 19:11:25 2017 +0200 +++ b/hedgewars/uTypes.pas Sat Oct 07 13:23:58 2017 -0400 @@ -89,7 +89,8 @@ sprBulletHit, sprSnowball, sprHandSnowball, sprSnow, sprSDFlake, sprSDWater, sprSDCloud, sprSDSplash, sprSDDroplet, sprTardis, sprSlider, sprBotlevels, sprHandKnife, sprKnife, sprStar, sprIceTexture, sprIceGun, - sprFrozenHog, sprAmRubber, sprBoing, sprCustom1, sprCustom2, sprAirMine, sprHandAirMine, + sprFrozenHog, sprAmRubber, sprBoing, sprCustom1, sprCustom2, sprCustom3, sprCustom4, + sprCustom5, sprCustom6, sprCustom7, sprCustom8, sprAirMine, sprHandAirMine, sprFlakeL, sprSDFlakeL, sprCloudL, sprSDCloudL, sprDuck, sprHandDuck ); @@ -149,7 +150,8 @@ sndIceBeam, sndHogFreeze, sndAirMineImpact, sndKnifeImpact, sndExtraTime, sndLaserSight, sndInvulnerable, sndJetpackLaunch, sndJetpackBoost, sndPortalShot, sndPortalSwitch, sndPortalOpen, sndBlowTorch, sndCountdown1, sndCountdown2, sndCountdown3, sndCountdown4, - sndDuckDrop, sndDuckWater, sndDuckDie); + sndDuckDrop, sndDuckWater, sndDuckDie, sndCustom1, sndCustom2, sndCustom3, sndCustom4, + sndCustom5, sndCustom6, sndCustom7, sndCustom8); // Available ammo types to be used by hedgehogs TAmmoType = (amNothing, amGrenade, amClusterBomb, amBazooka, amBee, amShotgun, amPickHammer, // 6 diff -r 2e0a38566178 -r 308846e05154 hedgewars/uVariables.pas --- a/hedgewars/uVariables.pas Sat Oct 07 19:11:25 2017 +0200 +++ b/hedgewars/uVariables.pas Sat Oct 07 13:23:58 2017 -0400 @@ -741,6 +741,18 @@ Width: 0; Height: 0; imageWidth: 0; imageHeight: 0; saveSurf: true; priority: tpLow; getDimensions: true; getImageDimensions: true), // sprCustom1 (FileName: 'custom2'; Path: ptCurrTheme;AltPath: ptGraphics; Texture: nil; Surface: nil; Width: 0; Height: 0; imageWidth: 0; imageHeight: 0; saveSurf: true; priority: tpLow; getDimensions: true; getImageDimensions: true), // sprCustom2 + (FileName: 'custom3'; Path: ptCurrTheme;AltPath: ptGraphics; Texture: nil; Surface: nil; + Width: 0; Height: 0; imageWidth: 0; imageHeight: 0; saveSurf: true; priority: tpLow; getDimensions: true; getImageDimensions: true), // sprCustom3 + (FileName: 'custom4'; Path: ptCurrTheme;AltPath: ptGraphics; Texture: nil; Surface: nil; + Width: 0; Height: 0; imageWidth: 0; imageHeight: 0; saveSurf: true; priority: tpLow; getDimensions: true; getImageDimensions: true), // sprCustom4 + (FileName: 'custom5'; Path: ptCurrTheme;AltPath: ptGraphics; Texture: nil; Surface: nil; + Width: 0; Height: 0; imageWidth: 0; imageHeight: 0; saveSurf: true; priority: tpLow; getDimensions: true; getImageDimensions: true), // sprCustom5 + (FileName: 'custom6'; Path: ptCurrTheme;AltPath: ptGraphics; Texture: nil; Surface: nil; + Width: 0; Height: 0; imageWidth: 0; imageHeight: 0; saveSurf: true; priority: tpLow; getDimensions: true; getImageDimensions: true), // sprCustom6 + (FileName: 'custom7'; Path: ptCurrTheme;AltPath: ptGraphics; Texture: nil; Surface: nil; + Width: 0; Height: 0; imageWidth: 0; imageHeight: 0; saveSurf: true; priority: tpLow; getDimensions: true; getImageDimensions: true), // sprCustom7 + (FileName: 'custom8'; Path: ptCurrTheme;AltPath: ptGraphics; Texture: nil; Surface: nil; + Width: 0; Height: 0; imageWidth: 0; imageHeight: 0; saveSurf: true; priority: tpLow; getDimensions: true; getImageDimensions: true), // sprCustom8 (FileName: 'AirMine'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil; Width: 32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false; priority: tpHighest; getDimensions: false; getImageDimensions: true), // sprAirMine (FileName: 'amAirMine'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil; diff -r 2e0a38566178 -r 308846e05154 share/hedgewars/Data/Graphics/custom3.png Binary file share/hedgewars/Data/Graphics/custom3.png has changed diff -r 2e0a38566178 -r 308846e05154 share/hedgewars/Data/Graphics/custom4.png Binary file share/hedgewars/Data/Graphics/custom4.png has changed diff -r 2e0a38566178 -r 308846e05154 share/hedgewars/Data/Graphics/custom5.png Binary file share/hedgewars/Data/Graphics/custom5.png has changed diff -r 2e0a38566178 -r 308846e05154 share/hedgewars/Data/Graphics/custom6.png Binary file share/hedgewars/Data/Graphics/custom6.png has changed diff -r 2e0a38566178 -r 308846e05154 share/hedgewars/Data/Graphics/custom7.png Binary file share/hedgewars/Data/Graphics/custom7.png has changed diff -r 2e0a38566178 -r 308846e05154 share/hedgewars/Data/Graphics/custom8.png Binary file share/hedgewars/Data/Graphics/custom8.png has changed diff -r 2e0a38566178 -r 308846e05154 share/hedgewars/Data/Sounds/custom1.ogg Binary file share/hedgewars/Data/Sounds/custom1.ogg has changed diff -r 2e0a38566178 -r 308846e05154 share/hedgewars/Data/Sounds/custom2.ogg Binary file share/hedgewars/Data/Sounds/custom2.ogg has changed diff -r 2e0a38566178 -r 308846e05154 share/hedgewars/Data/Sounds/custom3.ogg Binary file share/hedgewars/Data/Sounds/custom3.ogg has changed diff -r 2e0a38566178 -r 308846e05154 share/hedgewars/Data/Sounds/custom4.ogg Binary file share/hedgewars/Data/Sounds/custom4.ogg has changed diff -r 2e0a38566178 -r 308846e05154 share/hedgewars/Data/Sounds/custom5.ogg Binary file share/hedgewars/Data/Sounds/custom5.ogg has changed diff -r 2e0a38566178 -r 308846e05154 share/hedgewars/Data/Sounds/custom6.ogg Binary file share/hedgewars/Data/Sounds/custom6.ogg has changed diff -r 2e0a38566178 -r 308846e05154 share/hedgewars/Data/Sounds/custom7.ogg Binary file share/hedgewars/Data/Sounds/custom7.ogg has changed diff -r 2e0a38566178 -r 308846e05154 share/hedgewars/Data/Sounds/custom8.ogg Binary file share/hedgewars/Data/Sounds/custom8.ogg has changed