diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index 84a68348ac99945473f26de8ebd0fbfa47701343..f770a8c34270ed8d139d41ba8b5784d7af6d7aa9 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
FSecrets: Integer;
FCurrWeap: Byte;
FNextWeap: WORD;
- FNextWeapDelay: Byte; // frames
+ FNextWeapDelay: Byte; // frames (unused)
FBFGFireCounter: SmallInt;
FLastSpawnerUID: Word;
FLastHit: Byte;
FNetTime: LongWord;
mEDamageType: Integer;
+ // client-side only
+ weaponSwitchKeyReleased: array[0..16] of Byte; // bit 0: was released on prev frame; bit 1: new status
+
function CollideLevel(XInc, YInc: Integer): Boolean;
function StayOnStep(XInc, YInc: Integer): Boolean;
procedure DrawPickup();
procedure DrawRulez();
procedure DrawAim();
+ procedure DrawIndicator();
procedure DrawBubble();
procedure DrawGUI();
procedure Update(); virtual;
procedure getMapBox (out x, y, w, h: Integer); inline;
procedure moveBy (dx, dy: Integer); inline;
+ procedure releaseAllWeaponSwitchKeys ();
+ procedure weaponSwitchKeysStateChange (index: Integer; pressed: Boolean);
+ function isWeaponSwitchKeyReleased (index: Integer): Boolean;
+ procedure weaponSwitchKeysShiftNewStates ();
+
public
property Vel: TPoint2i read FObj.Vel;
property Obj: TObj read FObj;
gFly: Boolean = False;
gAimLine: Boolean = False;
gChatBubble: Byte = 0;
+ gPlayerIndicator: Boolean = True;
gNumBots: Word = 0;
gLMSPID1: Word = 0;
gLMSPID2: Word = 0;
FNetTime := 0;
resetWeaponQueue();
+ releaseAllWeaponSwitchKeys();
end;
+
+procedure TPlayer.releaseAllWeaponSwitchKeys ();
+var
+ f: Integer;
+begin
+ for f := 0 to High(weaponSwitchKeyReleased) do weaponSwitchKeyReleased[f] := $03;
+end;
+
+procedure TPlayer.weaponSwitchKeysStateChange (index: Integer; pressed: Boolean);
+begin
+ Inc(index, 2); // -2: prev; -1: next
+ if (index < 0) or (index > High(weaponSwitchKeyReleased)) then exit;
+ weaponSwitchKeyReleased[index] := weaponSwitchKeyReleased[index] or $02;
+ if (pressed) then weaponSwitchKeyReleased[index] := weaponSwitchKeyReleased[index] xor $02;
+end;
+
+function TPlayer.isWeaponSwitchKeyReleased (index: Integer): Boolean;
+begin
+ Inc(index, 2); // -2: prev; -1: next
+ if (index < 0) or (index > High(weaponSwitchKeyReleased)) then
+ begin
+ result := true;
+ end
+ else
+ begin
+ result := (weaponSwitchKeyReleased[index] and $01) <> 0;
+ end;
+end;
+
+procedure TPlayer.weaponSwitchKeysShiftNewStates ();
+var
+ f: Integer;
+begin
+ // copy bit 1 to bit 0
+ for f := 0 to High(weaponSwitchKeyReleased) do
+ begin
+ weaponSwitchKeyReleased[f] :=
+ (weaponSwitchKeyReleased[f] and $02) or
+ ((weaponSwitchKeyReleased[f] shr 1) and $01);
+ end;
+end;
+
+
procedure TPlayer.positionChanged (); inline;
begin
end;
inherited;
end;
+procedure TPlayer.DrawIndicator();
+var
+ indX, indY: Integer;
+ indW, indH: Word;
+ ID: DWORD;
+begin
+ if FAlive then
+ begin
+ indX := FObj.X+FObj.Rect.X;
+ indY := FObj.Y - 12;
+ if g_Texture_Get('TEXTURE_PLAYER_INDICATOR', ID) then
+ begin
+ e_GetTextureSize(ID, @indW, @indH);
+ e_Draw(ID, indX + indW div 2, indY, 0, True, False);
+ end;
+ end;
+ //e_TextureFontPrint(indX, indY, FName, gStdFont); // Shows player name overhead
+end;
+
procedure TPlayer.DrawBubble();
var
bubX, bubY: Integer;
result := false;
case weapon of
WEAPON_KASTET, WEAPON_SAW: result := true;
- WEAPON_SHOTGUN1, WEAPON_SHOTGUN2: result := (FAmmo[A_SHELLS] > 0);
- WEAPON_PISTOL, WEAPON_CHAINGUN, WEAPON_SUPERPULEMET: result := (FAmmo[A_BULLETS] > 0);
+ WEAPON_SHOTGUN1, WEAPON_SHOTGUN2, WEAPON_SUPERPULEMET: result := (FAmmo[A_SHELLS] > 0);
+ WEAPON_PISTOL, WEAPON_CHAINGUN: result := (FAmmo[A_BULLETS] > 0);
WEAPON_ROCKETLAUNCHER: result := (FAmmo[A_ROCKETS] > 0);
WEAPON_PLASMA, WEAPON_BFG: result := (FAmmo[A_CELLS] > 0);
WEAPON_FLAMETHROWER: result := (FAmmo[A_FUEL] > 0);
// two knuckles are for "normal" and "berserk" (see `if` below -- it removes the one that is not needed)
// priorities:
// bfg, launcher, plasma, flamethrower, ssg, minigun, sg, pistol, berserk, chainsaw, fist
- weaponOrder[0] := WEAPON_BFG;
- weaponOrder[1] := WEAPON_ROCKETLAUNCHER;
- weaponOrder[2] := WEAPON_PLASMA;
- weaponOrder[3] := WEAPON_FLAMETHROWER;
- weaponOrder[4] := WEAPON_SHOTGUN2;
- weaponOrder[5] := WEAPON_CHAINGUN;
- weaponOrder[6] := WEAPON_SHOTGUN1;
- weaponOrder[7] := WEAPON_PISTOL;
- weaponOrder[8] := WEAPON_KASTET+666; // berserk fist
- weaponOrder[9] := WEAPON_SAW;
- weaponOrder[10] := WEAPON_KASTET; // normal fist
- weaponOrder[11] := WEAPON_SUPERPULEMET;
+ weaponOrder[0] := WEAPON_SUPERPULEMET;
+ weaponOrder[1] := WEAPON_BFG;
+ weaponOrder[2] := WEAPON_ROCKETLAUNCHER;
+ weaponOrder[3] := WEAPON_PLASMA;
+ weaponOrder[4] := WEAPON_FLAMETHROWER;
+ weaponOrder[5] := WEAPON_SHOTGUN2;
+ weaponOrder[6] := WEAPON_CHAINGUN;
+ weaponOrder[7] := WEAPON_SHOTGUN1;
+ weaponOrder[8] := WEAPON_PISTOL;
+ weaponOrder[9] := WEAPON_KASTET+666; // berserk fist
+ weaponOrder[10] := WEAPON_SAW;
+ weaponOrder[11] := WEAPON_KASTET; // normal fist
for f := 0 to High(weaponOrder) do
begin
begin
//e_WriteLog(Format(' SWITCH: cur=%d; new=%d (dir=%d; log=%d)', [FCurrWeap, rwidx, dir, cwi]), TMsgType.Warning);
result := Byte(rwidx);
- FNextWeapDelay := 10;
+ //FNextWeapDelay := 10; //k8: not needed anymore
exit;
end;
end;
// no cycling
for i := 0 to High(wantThisWeapon) do wantThisWeapon[i] := false;
wwc := 0;
+
+ curlidx := -1; // start from a weapon with a highest priority (-1, 'cause loop will immediately increment this index)
+
for i := 0 to High(FWeapon) do
begin
if (FNextWeap and (1 shl i)) <> 0 then
begin
cwi := real2log(i);
- if (cwi >= 0) then wantThisWeapon[cwi] := true;
- Inc(wwc);
+ if (cwi >= 0) then
+ begin
+ wantThisWeapon[cwi] := true;
+ Inc(wwc);
+ // if we hit currently selected weapon, start seachring from it, so we'll get "next weaker" weapon
+ if (i = FCurrWeap) then curlidx := cwi; // compare real, start from logical
+ end;
end;
end;
exit;
end;
- // exclude currently selected weapon from the set
- curlidx := real2log(FCurrWeap);
//e_WriteLog(Format('*** wwc=%d; currweap=%d; logweap=%d', [wwc, FCurrWeap, curlidx]), TMsgType.Warning);
- //e_WriteLog(Format('FCurrWeap=%d; curlidx=%d', [FCurrWeap, curlidx]), TMsgType.Warning);
- //if (curlidx >= 0) then wantThisWeapon[curlidx] := false;
- //if (wwc = 2) then begin Dec(wwc); end; // easy case: switch between two weapons
// find next weapon to switch onto
cwi := curlidx;
- for i := 0 to High(FWeapon) do
+ for i := 0 to High(weaponOrder) do
begin
- cwi := (cwi+length(FWeapon)+1) mod length(FWeapon);
+ cwi := (cwi+length(weaponOrder)+1) mod length(weaponOrder);
if (cwi = curlidx) then continue; // skip current weapon
if not wantThisWeapon[cwi] then continue;
rwidx := weaponOrder[cwi];
if (rwidx < 0) then continue;
- //e_WriteLog(Format(' trying logical %d (real %d)', [cwi, rwidx]), TMsgType.Warning);
+ //e_WriteLog(Format(' trying logical %d (real %d); has=%d, hasammo=%d', [cwi, rwidx, Integer(FWeapon[rwidx]), Integer(hasAmmoForWeapon(rwidx))]), TMsgType.Warning);
if FWeapon[rwidx] and ((wwc = 1) or hasAmmoForWeapon(rwidx)) then
begin
//e_WriteLog(' I FOUND HER!', TMsgType.Warning);
// i found her!
result := Byte(rwidx);
resetWeaponQueue();
- FNextWeapDelay := 10; // anyway, 'cause why not
+ //FNextWeapDelay := 10; // anyway, 'cause why not; k8: not needed anymore
exit;
end;
end;
begin
//e_WriteLog(Format('***RealizeCurrentWeapon: FNextWeap=%x; FNextWeapDelay=%d', [FNextWeap, FNextWeapDelay]), MSG_WARNING);
//FNextWeap := FNextWeap and $1FFF;
- if FNextWeapDelay > 0 then Dec(FNextWeapDelay); // "alteration delay"
+ //HACK: alteration delay will be reset when player released any weapon switch key
+ FNextWeapDelay := 0; //k8: just in case
+ //if FNextWeapDelay > 0 then Dec(FNextWeapDelay); // "alteration delay"
if not switchAllowed then
begin