diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index 0ea771329dbf0358acd332b70e85d8e4fe24e90c..0ad3894b0e0af831c28d1178f79b748d8fa7e852 100644 (file)
--- a/src/game/g_netmsg.pas
+++ b/src/game/g_netmsg.pas
NET_EV_KILLCOMBO = 17;
NET_EV_PLAYER_TOUCH = 18;
NET_EV_SECRET = 19;
NET_EV_KILLCOMBO = 17;
NET_EV_PLAYER_TOUCH = 18;
NET_EV_SECRET = 19;
+ NET_EV_INTER_READY = 20;
NET_VE_STARTED = 1;
NET_VE_PASSED = 2;
NET_VE_STARTED = 1;
NET_VE_PASSED = 2;
NET_CHEAT_SUICIDE = 1;
NET_CHEAT_SPECTATE = 2;
NET_CHEAT_SUICIDE = 1;
NET_CHEAT_SPECTATE = 2;
+ NET_CHEAT_READY = 3;
NET_MAX_DIFFTIME = 5000 div 36;
NET_MAX_DIFFTIME = 5000 div 36;
else
Pl.Spectate;
end;
else
Pl.Spectate;
end;
+ NET_CHEAT_READY:
+ begin
+ if gState <> STATE_INTERCUSTOM then Exit;
+ Pl.FReady := not Pl.FReady;
+ if Pl.FReady then
+ begin
+ MH_SEND_GameEvent(NET_EV_INTER_READY, Pl.UID, 'Y');
+ Inc(gInterReadyCount);
+ end
+ else
+ begin
+ MH_SEND_GameEvent(NET_EV_INTER_READY, Pl.UID, 'N');
+ Dec(gInterReadyCount);
+ end;
+ end;
end;
end;
end;
end;
end;
end;
end;
end;
+ NET_EV_INTER_READY:
+ begin
+ pl := g_Player_Get(EvNum);
+ if pl <> nil then pl.FReady := (EvStr = 'Y');
+ end;
end;
end;
end;
end;
if gPlayerAction[0, ACTION_STRAFE] then
begin
// new strafe mechanics
if gPlayerAction[0, ACTION_STRAFE] then
begin
// new strafe mechanics
- if (strafeDir = 0) then strafeDir := P1MoveButton; // start strafing
+ if (strafeDir = 0) then
+ strafeDir := P1MoveButton; // start strafing
// now set direction according to strafe (reversed)
// now set direction according to strafe (reversed)
- if (strafeDir = 2) then gPlayer1.SetDirection(TDirection.D_LEFT)
- else if (strafeDir = 1) then gPlayer1.SetDirection(TDirection.D_RIGHT);
+ if (strafeDir = 2) then
+ gPlayer1.SetDirection(TDirection.D_LEFT)
+ else if (strafeDir = 1) then
+ gPlayer1.SetDirection(TDirection.D_RIGHT)
end
else
begin
end
else
begin
+ strafeDir := 0; // not strafing anymore
if (P1MoveButton = 2) and gPlayerAction[0, ACTION_MOVELEFT] then
gPlayer1.SetDirection(TDirection.D_LEFT)
else if (P1MoveButton = 1) and gPlayerAction[0, ACTION_MOVERIGHT] then
if (P1MoveButton = 2) and gPlayerAction[0, ACTION_MOVELEFT] then
gPlayer1.SetDirection(TDirection.D_LEFT)
else if (P1MoveButton = 1) and gPlayerAction[0, ACTION_MOVERIGHT] then