hedgewars-draft: comparison hedgewars/uVariables.pas

equal deleted inserted replaced

-:6e8b807bda4b
+:ba39a1d396c0
 cShowFPS           : boolean;
 cFlattenFlakes     : boolean;
 cFlattenClouds     : boolean;
 cIce               : boolean;
 cSnow              : boolean;
+isInChatMode       : boolean;
 cAltDamage         : boolean;
 cReducedQuality    : LongWord;
 UserNick           : shortstring;
 recordFileName     : shortstring;
 cCloudsNumber    : LongWord;
 cSDCloudsNumber  : LongWord;
 cTagsMask        : byte;
+cPrevTagsMask    : byte;
 zoom             : GLfloat;
 ZoomValue        : GLfloat;
 cWaterLine       : LongInt;
 cGearScrEdgesDist: LongInt;
 cScriptName     : shortstring;
 cScriptParam    : shortstring;
 cSeed           : shortstring;
 cVolumeDelta    : LongInt;
+cMuteToggle     : boolean; // Mute toggle requested
 cHasFocus       : boolean;
 cInactDelay     : Longword;
 bBetweenTurns   : boolean;
 bWaterRising    : boolean;
 cBuildMaxDist   : LongInt;
 cDamageModifier : hwFloat;
 cLaserSighting  : boolean;
 cLaserSightingSniper : boolean;
 cVampiric       : boolean;
-cArtillery      : boolean;
 WeaponTooltipTex: PTexture;
 AmmoMenuInvalidated: boolean;
 AmmoRect        : TSDL_Rect;
 HHTexture       : PTexture;
 cMaxZoomLevel   : real;
 LuaTemplateNumber : LongWord;
 // for EndTurn Lua call
 LuaEndTurnRequested: boolean;
 LuaNoEndTurnTaunts: boolean;
+MaskedSounds : array[TSound] of boolean;
 LastVoice : TVoice;
 mobileRecord: TMobileRecord;
 // sprNapalmBomb
 (FileName:  'BulletHit'; Path: ptGraphics; AltPath: ptNone;
 Texture: nil; Surface: nil; Width:  32; Height: 32;
 imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority:
 tpMedium; getDimensions: false; getImageDimensions: true),
-// sprNapalmBomb
+// sprBulletHit
 (FileName:  'Snowball'; Path: ptCurrTheme; AltPath: ptGraphics; Texture: nil; Surface: nil;
 Width:  16; Height: 16; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprSnowball
 (FileName:  'amSnowball'; Path: ptCurrTheme; AltPath: ptHedgehog; Texture: nil; Surface: nil;
 Width:  64; Height: 64; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprHandSnowball
 (FileName:  'Snow'; Path: ptCurrTheme; AltPath: ptGraphics; Texture: nil; Surface: nil;
 Width:   0; Height:  0; imageWidth: 0; imageHeight: 0; saveSurf: true; critical: true; checkSum: 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; critical: true; checkSum: 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; critical: true; checkSum: true; priority: tpLow; getDimensions: true; getImageDimensions: true), // sprCustom8
+(FileName:      'FrozenAirMine'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
+Width:  32; Height: 32; imageWidth: 32; imageHeight: 32; saveSurf: true; critical: true; checkSum: true; priority: tpHighest; getDimensions: false; getImageDimensions: true), // sprFrozenAirMine
 (FileName:      'AirMine'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
 Width:  32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpHighest; getDimensions: false; getImageDimensions: true), // sprAirMine
 (FileName:  'amAirMine'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
 Width:  64; Height: 64; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true), // sprHandAirMine
 (FileName:      'FlakeL'; Path:ptCurrTheme; AltPath: ptNone; Texture: nil; Surface: nil;
 (FileName:     'SDCloudsL'; Path: ptCurrTheme;AltPath: ptGraphics; Texture: nil; Surface: nil;
 Width: 256; Height:128; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: false; checkSum: false; priority: tpHigh; getDimensions: false; getImageDimensions: true),// sprSDCloudL
 (FileName:     'Duck'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
 Width:  32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprDuck
 (FileName:    'amDuck'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
-Width:  64; Height: 64; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true) // sprHandDuck
+Width:  64; Height: 64; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true), // sprHandDuck
+(FileName: 'amMinigun'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
+Width:  64; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true) // sprMinigun
 );
 const
 Wavez: array [TWave] of record
 Sprite: TSprite;
 isDamaging: true;
 SkipTurns: 0;
 PosCount: 1;
 PosSprite: sprWater;
 ejectX: 15;
-ejectY: -7)
+ejectY: -7),
+// Minigun
+(NameId: sidMinigun;
+NameTex: nil;
+Probability: 100;
+NumberInCase: 1;
+Ammo: (Propz: ammoprop_NeedUpDown;
+Count: 1;
+NumPerTurn: 0;
+Timer: 0;
+Pos: 0;
+AmmoType: amMinigun;
+AttackVoice: sndNone;
+Bounciness: 1000);
+Slot: 2;
+TimeAfterTurn: 3000;
+minAngle: cMaxAngle div 6;
+maxAngle: 5 * cMaxAngle div 6;
+isDamaging: true;
+SkipTurns: 0;
+PosCount: 1;
+PosSprite: sprWater;
+ejectX: 0; //23;
+ejectY: 0) //-6;
 );
 var
 Land: TCollisionArray;
 LandPixels: TLandArray;
 lastGearByUID: PGear;
 GearsList: PGear;
 AllInactive: boolean;
 PrvInactive: boolean;
 KilledHHs: Longword;
-SuddenDeath: Boolean;
+SuddenDeath: Boolean; // If the Sudden Death check has been made
-SuddenDeathDmg: Boolean;
+SuddenDeathActive: Boolean; // Is in Sudden Death with any gameplay effect
+SuddenDeathDmg: Boolean; // Is in Sudden Death with damage
 SpeechType: Longword;
 SpeechText: shortstring;
 PlacingHogs: boolean; // a convenience flag to indicate placement of hogs is still in progress
 StepSoundTimer: LongInt;
 StepSoundChannel: LongInt;
 CurrentTeam: PTeam;
 PreviousTeam: PTeam;
 CurrentHedgehog: PHedgehog;
 TeamsArray: array[0..Pred(cMaxTeams)] of PTeam;
-TeamsCount: Longword;
+TeamsCount: Longword; // number of teams on game start
+VisibleTeamsCount: Longword; // number of teams visible in team bar
 ClansArray, SpawnClansArray: TClansArray;
 ClansCount: Longword;
 LocalClan: LongInt;  // last non-bot, non-extdriven clan
 LocalTeam: LongInt;  // last non-bot, non-extdriven clan first team
 LocalAmmo: LongInt;  // last non-bot, non-extdriven clan's first team's ammo index, updated to next upcoming hog for per-hog-ammo
 trammod: array[TAmmoStrId] of ansistring;   // description of the weapon
 trluaammo: array[TAmmoStrId] of ansistring; // name of the weapon (Lua overwrite)
 trluaammoc: array[TAmmoStrId] of ansistring; // caption of the weapon (Lua overwrite)
 trluaammod: array[TAmmoStrId] of ansistring;  // description of the weapon (Lua overwrite)
 trluaammoa: array[TAmmoStrId] of ansistring; // description appendix of the weapon (Lua only)
+trluaammoe: array[TAmmoStrId] of boolean;   // whether to render extra text (Lua overwrite)
 trmsg:   array[TMsgStrId]  of ansistring;   // message of the event
 trgoal:  array[TGoalStrId] of ansistring;   // message of the goal
 cTestLua : Boolean;
 procedure preInitModule;
 cVideoQuality      := 0;
 cAudioCodec        := '';
 {$ENDIF}
 cTagsMask:= htTeamName or htName or htHealth;
+cPrevTagsMask:= cTagsMask;
 end;
 procedure initScreenSpaceVars();
 begin
 // those values still are not perfect
 end;
 procedure initModule;
 var s: shortstring;
 i: integer;
+t: TSound;
+a: TAmmoStrId;
 begin
 // init LastVoice
 LastVoice.snd:= sndNone;
 LastVoice.voicepack:= nil;
 cIce                := false;
 cSnow               := false;
 lastVisualGearByUID := nil;
 lastGearByUID       := nil;
 cReadyDelay         := 5000;
+isInChatMode        := false;
 {*  REFERENCE
 4096 -> $FFFFF000
 2048 -> $FFFFF800
 1024 -> $FFFFFC00
 cZoomDelta:= 0.20;
 {$ELSE}
 cMaxZoomLevel:= 1.0;
 cMinZoomLevel:= 3.0;
 cZoomDelta:= 0.25;
 {$ENDIF}
+aVertex:= 0;
+aTexCoord:= 1;
+aColor:= 2;
 cMinMaxZoomLevelDelta:= cMaxZoomLevel - cMinZoomLevel;
 // int, longint longword and byte
 CursorMovementX     := 0;
 ZoomValue       := cDefaultZoomLevel;
 WeaponTooltipTex:= nil;
 cLaserSighting  := false;
 cLaserSightingSniper := false;
 cVampiric       := false;
-cArtillery      := false;
 flagMakeCapture := false;
 flagDumpLand    := false;
 bBetweenTurns   := false;
 bWaterRising    := false;
 isCursorVisible := false;
 fastUntilLag    := false;
 fastScrolling   := false;
 autoCameraOn    := true;
 cSeed           := '';
 cVolumeDelta    := 0;
+cMuteToggle     := false;
 cHasFocus       := true;
 cInactDelay     := 100;
 ReadyTimeLeft   := 0;
 disableLandBack := false;
 LuaTemplateNumber:= 0;
 LuaEndTurnRequested:= false;
 LuaNoEndTurnTaunts:= false;
+for t:= Low(TSound) to High(TSound) do
+MaskedSounds[t]:= false;
+for a:= Low(TAmmoStrId) to High(TAmmoStrId) do
+trluaammoe[a]:= true;
 UIDisplay:= uiAll;
 LocalMessage:= 0;
 cStereoDepth:= 0;

branch	ios-develop
changeset 13413	ba39a1d396c0
parent 13405	4c813650fe17
child 13457	38814954a248