X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_netmsg.pas;h=9563b8083f9fd7d1f7955a35fb0a36a96200cf35;hb=2ce8c39f1c6e2ade354a14bd7fce6be00c8c7b0a;hp=e9cc68c2ee55ac7fcb0067073ed725ecdedd6e9e;hpb=2587eb5662fe075d616c89950be655d15fee15d6;p=d2df-sdl.git diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas index e9cc68c..9563b80 100644 --- a/src/game/g_netmsg.pas +++ b/src/game/g_netmsg.pas @@ -464,7 +464,7 @@ begin writeln('HOST PLRPOS: got: currweap=', CurrWeap, '; curfrm=', gTime, '; netweap=', newweapon, '; oldweap=', CurrWeap); {$ENDIF} //NetForceWeap := newweapon; - SetWeaponHost(newweapon); + SetWeapon(newweapon); end; //e_WriteLog(Format('R:ws=%d', [WeaponSelect]), MSG_WARNING); if Direction <> TDirection(Dir) then @@ -2150,7 +2150,7 @@ begin if (gTime >= NetForceWeapFIdx) then begin //NetForceWeap := newweapon; - SetWeaponHost(newweapon); + SetWeapon(newweapon); end; //SetWeapon(M.ReadByte()); @@ -2839,11 +2839,9 @@ begin begin if isKeyPressed(KeyWeapon[I], KeyWeapon2[I]) then begin - //writeln('keyweapon #', i, ' is pressed; released=', Integer(gPlayer1.isWeaponSwitchKeyReleased(i)), '; frm=', gPlayer1.NetForceWeapFIdx, '; gTime=', gTime); gPlayer1.weaponSwitchKeysStateChange(i, true); if gPlayer1.isWeaponSwitchKeyReleased(i) then begin - //writeln('keyweapon #', i, ' is pressed; released=', Integer(gPlayer1.isWeaponSwitchKeyReleased(i)), '; frm=', gPlayer1.NetForceWeapFIdx, '; gTime=', gTime); gPlayer1.QueueWeaponSwitch(i); // all choices are passed there, and god will take the best //WeaponSelect := WeaponSelect or Word(1 shl I); end;