diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index 5719d11d87cfe058314d818bb3b6eb83c5a890b0..1d036616a4884835132d9bde3643baae1f5f80c8 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
procedure Jump();
procedure Use();
- procedure cycleWeapon (dir: Integer);
function getNextWeaponIndex (): Byte; // return 255 for "no switch"
procedure resetWeaponQueue ();
function hasAmmoForWeapon (weapon: Byte): Boolean;
begin
if gPlayers = nil then Exit;
+ //e_WriteLog('***g_Player_UpdateAll: ENTER', MSG_WARNING);
for i := 0 to High(gPlayers) do
+ begin
if gPlayers[i] <> nil then
- if gPlayers[i] is TPlayer then gPlayers[i].Update()
- else TBot(gPlayers[i]).Update();
+ begin
+ if gPlayers[i] is TPlayer then
+ begin
+ gPlayers[i].Update();
+ gPlayers[i].RealizeCurrentWeapon(); // WARNING! DO NOT MOVE THIS INTO `Update()`!
+ end
+ else
+ begin
+ // bot updates weapons in `UpdateCombat()`
+ TBot(gPlayers[i]).Update();
+ end;
+ end;
+ end;
+ //e_WriteLog('***g_Player_UpdateAll: EXIT', MSG_WARNING);
end;
procedure g_Player_DrawAll();
i: Word;
wantThisWeapon: array[0..64] of Boolean;
wwc: Integer = 0; //HACK!
+ dir, cwi: Integer;
begin
result := 255; // default result: "no switch"
+ // had weapon cycling on previous frame? remove that flag
+ if (FNextWeap and $2000) <> 0 then begin FNextWeap := FNextWeap and $1FFF; FNextWeapDelay := 0; end;
+ // cycling has priority
+ if (FNextWeap and $C000) <> 0 then
+ begin
+ if (FNextWeap and $8000) <> 0 then dir := 1 else dir := -1;
+ FNextWeap := FNextWeap or $2000; // we need this
+ if FNextWeapDelay > 0 then exit; // cooldown time
+ cwi := FCurrWeap;
+ for i := 0 to High(FWeapon) do
+ begin
+ cwi := (cwi+length(FWeapon)+dir) mod length(FWeapon);
+ if FWeapon[cwi] then
+ begin
+ //e_WriteLog(Format(' SWITCH: cur=%d; new=%d', [FCurrWeap, cwi]), MSG_WARNING);
+ result := Byte(cwi);
+ FNextWeapDelay := 10;
+ exit;
+ end;
+ end;
+ resetWeaponQueue();
+ exit;
+ end;
+ // no cycling
for i := 0 to High(wantThisWeapon) do wantThisWeapon[i] := false;
for i := 0 to High(FWeapon) do if (FNextWeap and (1 shl i)) <> 0 then begin wantThisWeapon[i] := true; Inc(wwc); end;
- if wantThisWeapon[FCurrWeap] then
- begin
- // these hacks implements alternating between SG and SSG; sorry
- if FCurrWeap = WEAPON_SHOTGUN1 then begin wantThisWeapon[WEAPON_SHOTGUN2] := true; Inc(wwc); end;
- if FCurrWeap = WEAPON_SHOTGUN2 then begin wantThisWeapon[WEAPON_SHOTGUN1] := true; Inc(wwc); end;
- // these hacks implements alternating between knuckles and chainsaw; sorry
- if FCurrWeap = WEAPON_KASTET then begin wantThisWeapon[WEAPON_SAW] := true; Inc(wwc); end;
- if FCurrWeap = WEAPON_SAW then begin wantThisWeapon[WEAPON_KASTET] := true; Inc(wwc); end;
- end;
// exclude currently selected weapon from the set
wantThisWeapon[FCurrWeap] := false;
// slow down alterations a little
if wwc > 1 then
begin
+ //e_WriteLog(Format(' FNextWeap=%x; delay=%d', [FNextWeap, FNextWeapDelay]), MSG_WARNING);
// more than one weapon requested, assume "alteration" and check alteration delay
if FNextWeapDelay > 0 then begin FNextWeap := 0; exit; end; // yeah
end;
// do not reset weapon queue, it will be done in `RealizeCurrentWeapon()`
+ // but clear all counters if no weapon should be switched
+ if wwc < 1 then begin resetWeaponQueue(); exit; end;
+ //e_WriteLog(Format('wwc=%d', [wwc]), MSG_WARNING);
// try weapons in descending order
for i := High(FWeapon) downto 0 do
begin
begin
// i found her!
result := Byte(i);
+ resetWeaponQueue();
+ FNextWeapDelay := 10; // anyway, 'cause why not
exit;
end;
end;
+ // no suitable weapon found, so reset the queue, to avoid accidental "queuing" of weapon w/o ammo
+ resetWeaponQueue();
end;
procedure TPlayer.RealizeCurrentWeapon();
+ function switchAllowed (): Boolean;
+ var
+ i: Byte;
+ begin
+ result := false;
+ if FBFGFireCounter <> -1 then exit;
+ if FTime[T_SWITCH] > gTime then exit;
+ for i := WEAPON_KASTET to WEAPON_SUPERPULEMET do if FReloading[i] > 0 then exit;
+ result := true;
+ end;
+
var
- i, nw: Byte;
+ nw: Byte;
begin
- nw := getNextWeaponIndex();
+ //e_WriteLog(Format('***RealizeCurrentWeapon: FNextWeap=%x; FNextWeapDelay=%d', [FNextWeap, FNextWeapDelay]), MSG_WARNING);
+ //FNextWeap := FNextWeap and $1FFF;
if FNextWeapDelay > 0 then Dec(FNextWeapDelay); // "alteration delay"
- if nw = 255 then exit; // don't reset anything here
- if nw > High(FWeapon) then begin resetWeaponQueue(); exit; end; // don't forget to reset queue here!
- if FBFGFireCounter <> -1 then exit;
- if FTime[T_SWITCH] > gTime then exit;
+ if not switchAllowed then
+ begin
+ //HACK for weapon cycling
+ if (FNextWeap and $7000) <> 0 then FNextWeap := 0;
+ exit;
+ end;
- for i := WEAPON_KASTET to WEAPON_SUPERPULEMET do if FReloading[i] > 0 then exit;
+ nw := getNextWeaponIndex();
+ if nw = 255 then exit; // don't reset anything here
+ if nw > High(FWeapon) then
+ begin
+ // don't forget to reset queue here!
+ //e_WriteLog(' RealizeCurrentWeapon: WUTAFUUUU', MSG_WARNING);
+ resetWeaponQueue();
+ exit;
+ end;
if FWeapon[nw] then
begin
FModel.SetWeapon(FCurrWeap);
if g_Game_IsNet then MH_SEND_PlayerStats(FUID);
end;
- // reset weapon queue; `getNextWeaponIndex()` guarantees to not select a weapon player don't have
- resetWeaponQueue();
- FNextWeapDelay := 10; // anyway, 'cause why not
-end;
-
-procedure TPlayer.cycleWeapon (dir: Integer);
-var
- i, cwi: Integer;
-begin
- if dir < 0 then dir := 1 else if dir > 0 then dir := 1 else exit;
- cwi := FCurrWeap;
- for i := 0 to High(FWeapon) do
- begin
- cwi := cwi+dir;
- if cwi < 0 then cwi += length(FWeapon)
- else if cwi > High(FWeapon) then cwi := cwi-length(FWeapon);
- if FWeapon[cwi] then
- begin
- QueueWeaponSwitch(Byte(cwi));
- exit;
- end;
- end;
end;
procedure TPlayer.NextWeapon();
begin
if g_Game_IsClient then Exit;
- cycleWeapon(1);
+ FNextWeap := $8000;
end;
procedure TPlayer.PrevWeapon();
begin
if g_Game_IsClient then Exit;
- cycleWeapon(-1);
+ FNextWeap := $4000;
end;
procedure TPlayer.SetWeapon(W: Byte);
FIncCam := FIncCam*i;
end;
+ // no need to do that each second frame, weapon queue will take care of it
+ if FLive and FKeys[KEY_NEXTWEAPON].Pressed and AnyServer then NextWeapon();
+ if FLive and FKeys[KEY_PREVWEAPON].Pressed and AnyServer then PrevWeapon();
+
if gTime mod (GAME_TICK*2) <> 0 then
begin
if (FObj.Vel.X = 0) and FLive then
// Let alive player do some actions
if FKeys[KEY_LEFT].Pressed then Run(D_LEFT);
if FKeys[KEY_RIGHT].Pressed then Run(D_RIGHT);
- if FKeys[KEY_NEXTWEAPON].Pressed and AnyServer then NextWeapon();
- if FKeys[KEY_PREVWEAPON].Pressed and AnyServer then PrevWeapon();
+ //if FKeys[KEY_NEXTWEAPON].Pressed and AnyServer then NextWeapon();
+ //if FKeys[KEY_PREVWEAPON].Pressed and AnyServer then PrevWeapon();
if FKeys[KEY_FIRE].Pressed and AnyServer then Fire();
if FKeys[KEY_OPEN].Pressed and AnyServer then Use();
if FKeys[KEY_JUMP].Pressed then Jump()
FJetFuel := JET_MAX;
end;
+ ITEM_MEDKIT_SMALL: if FHealth < PLAYER_HP_SOFT then IncMax(FHealth, 10, PLAYER_HP_SOFT);
+ ITEM_MEDKIT_LARGE: if FHealth < PLAYER_HP_SOFT then IncMax(FHealth, 25, PLAYER_HP_SOFT);
+
+ ITEM_ARMOR_GREEN: if FArmor < PLAYER_AP_SOFT then FArmor := PLAYER_AP_SOFT;
+ ITEM_ARMOR_BLUE: if FArmor < PLAYER_AP_LIMIT then FArmor := PLAYER_AP_LIMIT;
+
+ ITEM_SPHERE_BLUE: if FHealth < PLAYER_HP_LIMIT then IncMax(FHealth, 100, PLAYER_HP_LIMIT);
+ ITEM_SPHERE_WHITE:
+ if (FHealth < PLAYER_HP_LIMIT) or (FArmor < PLAYER_AP_LIMIT) then
+ begin
+ if FHealth < PLAYER_HP_LIMIT then FHealth := PLAYER_HP_LIMIT;
+ if FArmor < PLAYER_AP_LIMIT then FArmor := PLAYER_AP_LIMIT;
+ end;
+
ITEM_WEAPON_SAW: FWeapon[WEAPON_SAW] := True;
ITEM_WEAPON_SHOTGUN1: FWeapon[WEAPON_SHOTGUN1] := True;
ITEM_WEAPON_SHOTGUN2: FWeapon[WEAPON_SHOTGUN2] := True;
begin
UpdateMove();
UpdateCombat();
+ end
+ else
+ begin
+ RealizeCurrentWeapon();
end;
end;