diff -r c07f341adad9 -r bb95e351270c hedgewars/uTypes.pas --- a/hedgewars/uTypes.pas Mon Jun 17 23:24:18 2013 +0200 +++ b/hedgewars/uTypes.pas Tue Jun 18 09:48:10 2013 +0200 @@ -43,9 +43,9 @@ // Different files are stored in different folders, this enumeration is used to tell which folder to use TPathType = (ptNone, ptData, ptGraphics, ptThemes, ptCurrTheme, ptTeams, ptMaps, - ptMapCurrent, ptDemos, ptSounds, ptGraves, ptFonts, ptForts, - ptLocale, ptAmmoMenu, ptHedgehog, ptVoices, ptHats, ptFlags, ptMissionMaps, ptSuddenDeath, ptButtons, - ptShaders); + ptMapCurrent, ptDemos, ptSounds, ptGraves, ptFonts, ptForts, ptLocale, + ptAmmoMenu, ptHedgehog, ptVoices, ptHats, ptFlags, ptMissionMaps, + ptSuddenDeath, ptButtons, ptShaders); // Available sprites for displaying stuff TSprite = (sprWater, sprCloud, sprBomb, sprBigDigit, sprFrame, @@ -87,11 +87,12 @@ sprHandResurrector, sprCross, sprAirDrill, sprNapalmBomb, sprBulletHit, sprSnowball, sprHandSnowball, sprSnow, sprSDFlake, sprSDWater, sprSDCloud, sprSDSplash, sprSDDroplet, sprTardis, - sprSlider, sprBotlevels, sprHandKnife, sprKnife, sprStar, sprIceTexture, sprIceGun, sprFrozenHog + sprSlider, sprBotlevels, sprHandKnife, sprKnife, sprStar, sprIceTexture, sprIceGun, + sprFrozenHog ); // Gears that interact with other Gears and/or Land - TGearType = ({-->}gtFlame, gtHedgehog, gtMine, gtCase, gtExplosives, // <-- these are gears which should be avoided when searching a spawn place + TGearType = (gtFlame, gtHedgehog, gtMine, gtCase, gtExplosives, // these gears should be avoided when searching a spawn place gtGrenade, gtShell, gtGrave, gtBee, // 8 gtShotgunShot, gtPickHammer, gtRope, // 11 gtDEagleShot, gtDynamite, gtClusterBomb, gtCluster, gtShover, // 16 @@ -139,9 +140,10 @@ sndHellishImpact1, sndHellishImpact2, sndHellishImpact3, sndHellishImpact4, sndMelonImpact, sndDroplet1, sndDroplet2, sndDroplet3, sndEggBreak, sndDrillRocket, sndPoisonCough, sndPoisonMoan, sndBirdyLay, sndWhistle, sndBeeWater, - sndPiano0, sndPiano1, sndPiano2, sndPiano3, sndPiano4, sndPiano5, sndPiano6, sndPiano7, sndPiano8, - sndSkip, sndSineGun, sndOoff1, sndOoff2, sndOoff3, sndWhack, - sndComeonthen, sndParachute, sndBump, sndResurrector, sndPlane, sndTardis, sndFrozenHogImpact, sndIceBeam, sndHogFreeze + sndPiano0, sndPiano1, sndPiano2, sndPiano3, sndPiano4, sndPiano5, sndPiano6, sndPiano7, + sndPiano8, sndSkip, sndSineGun, sndOoff1, sndOoff2, sndOoff3, sndWhack, + sndComeonthen, sndParachute, sndBump, sndResurrector, sndPlane, sndTardis, sndFrozenHogImpact, + sndIceBeam, sndHogFreeze ); // Available ammo types to be used by hedgehogs @@ -153,7 +155,9 @@ amRCPlane, amLowGravity, amExtraDamage, amInvulnerable, amExtraTime, // 35 amLaserSight, amVampiric, amSniperRifle, amJetpack, amMolotov, amBirdy, amPortalGun, // 42 amPiano, amGasBomb, amSineGun, amFlamethrower, amSMine, amHammer, // 48 - amResurrector, amDrillStrike, amSnowball, amTardis, {amStructure,} amLandGun, amIceGun, amKnife); // 54 + amResurrector, amDrillStrike, amSnowball, amTardis, {amStructure,} amLandGun, amIceGun, + amKnife // 54 + ); // Different kind of crates that e.g. hedgehogs can pick up TCrateType = (HealthCrate, AmmoCrate, UtilityCrate); @@ -168,11 +172,12 @@ siMaxTeamKills, siMaxTurnSkips, siCustomAchievement, siGraphTitle, siPointType); - // Various "emote" animations a hedgehog can do + // Various 'emote' animations a hedgehog can do TWave = (waveRollup, waveSad, waveWave, waveHurrah, waveLemonade, waveShrug, waveJuggle); TRenderMode = (rmDefault, rmLeftEye, rmRightEye); - TStereoMode = (smNone, smRedCyan, smCyanRed, smRedBlue, smBlueRed, smRedGreen, smGreenRed, smHorizontal, smVertical); + TStereoMode = (smNone, smRedCyan, smCyanRed, smRedBlue, smBlueRed, smRedGreen, smGreenRed, + smHorizontal, smVertical); THHFont = record Handle: PTTF_Font; @@ -185,8 +190,8 @@ TAmmo = record Propz: LongWord; Count: LongWord; -(* Using for place hedgehogs mode, but for any other situation where the initial count would be needed I guess. -For example, say, a mode where the weaponset is reset each turn, or on sudden death *) +// Using for place hedgehogs mode, but for any other situation where the initial count would be needed I guess. +// For example, say, a mode where the weaponset is reset each turn, or on sudden death NumPerTurn: LongWord; Timer: LongWord; Pos: LongWord; @@ -225,10 +230,10 @@ PClan = ^TClan; TGearStepProcedure = procedure (Gear: PGear); -// So, you're here looking for variables you can (ab)use to store some gear state? +// So, you are here looking for variables you can (ab)use to store some gear state? // Not all members of this structure are created equal. Comments below are my take on what can be used for what in the gear structure. TGear = record -// Don't ever override these. +// Do *not* ever override these. NextGear, PrevGear: PGear; // Linked list Z: Longword; // Z index. For rendering. Sets order in list Active: Boolean; // Is gear Active (running step code) @@ -258,10 +263,10 @@ Density : hwFloat; // Density is kind of a mix of size and density. Impacts distance thrown, wind. ImpactSound: TSound; // first sound, others have to be after it in the sounds def. nImpactSounds: Word; // count of ImpactSounds. -// Don't use these if you want to take damage normally, otherwise health/damage are commonly used for other purposes +// Do not use these if you want to take damage normally, otherwise health/damage are commonly used for other purposes Invulnerable: Boolean; Health, Damage, Karma: LongInt; -// DirAngle is a "real" - if you don't need it for rotation of sprite in uGearsRender, you can use it for any visual-only value +// DirAngle is a 'real' - if you do not need it for rotation of sprite in uGearsRender, you can use it for any visual-only value DirAngle: real; // These are frequently overridden to serve some other purpose Pos: Longword; // Commonly overridden. Example use is posCase values in uConsts. @@ -270,8 +275,8 @@ Tag: LongInt; // Quite generic. Variety of uses. FlightTime: Longword; // Initially added for batting of hogs to determine homerun. Used for some firing delays MsgParam: LongWord; // Initially stored a set of messages. So usually gm values like Message. Frequently overriden -// These are not used generically, but should probably be used for purpose intended. Definitely shouldn't override pointer type - Tex: PTexture; // A texture created by the gear. Shouldn't use for anything but textures +// These are not used generically, but should probably be used for purpose intended. Definitely should not override pointer type + Tex: PTexture; // A texture created by the gear. Should not use for anything but textures LinkedGear: PGear; // Used to track a related gear. Portal pairs for example. Hedgehog: PHedgehog; // set to CurrentHedgehog on gear creation SoundChannel: LongInt; // Used to track a sound the gear started @@ -405,12 +410,12 @@ TClan = record Color: Longword; Teams: array[0..Pred(cMaxTeams)] of PTeam; - TeamsNumber: LongInt;{xymeng, org:LongWord} + TeamsNumber: LongInt;{xymeng, org:LongWord} TagTeamIndex: Longword; CurrTeam: LongWord; ClanHealth: LongInt; ClanIndex: LongInt; - TurnNumber: LongInt;{xymeng, org:LongWord} + TurnNumber: LongInt;{xymeng, org:LongWord} Flawless: boolean; end; @@ -474,12 +479,12 @@ POnScreenWidget = ^TOnScreenWidget; TOnScreenWidget = record - show : boolean; // if false widget will not be drawn - sprite : TSprite; // a convenience type - frame : TSDL_Rect; // graphical coordinates - active : TSDL_Rect; // active touch region - fadeAnimStart : Longword; // time the fade started, 0 means don't fade - moveAnim : TWidgetMovement; // the animation associated to the widget + show : boolean; // if false widget will not be drawn + sprite : TSprite; // a convenience type + frame : TSDL_Rect; // graphical coordinates + active : TSDL_Rect; // active touch region + fadeAnimStart : Longword; // time the fade started, 0 means do not fade + moveAnim : TWidgetMovement; // the animation associated to the widget end; {$IFDEF SDL13}